aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@src.gnome.org>2002-03-02 09:34:02 +0000
committerDaniel Veillard <veillard@src.gnome.org>2002-03-02 09:34:02 +0000
commitc6613048af6864f162d0587bf221fac825672c71 (patch)
treea43cb277e02abf0fe60d4ff1be4f05417f7e7829
parentc0fef7745518d98f32d3fce0a0f2ba0eecb35c5f (diff)
downloadandroid_external_libxml2-c6613048af6864f162d0587bf221fac825672c71.tar.gz
android_external_libxml2-c6613048af6864f162d0587bf221fac825672c71.tar.bz2
android_external_libxml2-c6613048af6864f162d0587bf221fac825672c71.zip
fix bug #72706 when loading a NULL entity Daniel
* xmlIO.c: fix bug #72706 when loading a NULL entity Daniel
-rw-r--r--ChangeLog4
-rw-r--r--xmlIO.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 5ce6481e..02f04226 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Mar 2 10:33:04 CET 2002 Daniel Veillard <daniel@veillard.com>
+
+ * xmlIO.c: fix bug #72706 when loading a NULL entity
+
Fri Mar 1 17:14:42 CET 2002 Daniel Veillard <daniel@veillard.com>
* SAX.c: Fixed #72346, about handling of xmlns:foo="", this could
diff --git a/xmlIO.c b/xmlIO.c
index 815df620..056beb88 100644
--- a/xmlIO.c
+++ b/xmlIO.c
@@ -2528,6 +2528,8 @@ xmlDefaultExternalEntityLoader(const char *URL, const char *ID,
resource = (xmlChar *) URL;
if (resource == NULL) {
+ if (ID == NULL)
+ ID = "NULL";
if ((ctxt->validate) && (ctxt->sax != NULL) &&
(ctxt->sax->error != NULL))
ctxt->sax->error(ctxt,