apply fix from Stefan Kost to avoid a crash in xmllint, fixes 504284

* xmllint.c: apply fix from Stefan Kost to avoid a crash in xmllint, fixes 504284 Daniel svn path=/trunk/; revision=3673
Chronic-Dev · Jan 11, 2008 · 5608b17 · 5608b17
1 parent aa2404e
commit 5608b17
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Jan 11 14:48:40 CST 2008 Daniel Veillard <[email protected]>
+
+	* xmllint.c: apply fix from Stefan Kost to avoid a crash
+	  in xmllint, fixes 504284
+
 Fri Jan 11 14:39:03 CST 2008 Daniel Veillard <[email protected]>
 
 	* xml2-config.in: apply patch from Fred Crozat to avoid

diff --git a/xmllint.c b/xmllint.c
@@ -257,7 +257,7 @@ xmllintExternalEntityLoader(const char *URL, const char *ID,
     const char *lastsegment = URL;
     const char *iter = URL;
 
-    if (nbpaths > 0) {
+    if ((nbpaths > 0) && (iter != NULL)) {
 	while (*iter != 0) {
 	    if (*iter == '/')
 		lastsegment = iter + 1;