From c93a19fc1029bea8c63c7eaf9dc42dce32478fe9 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@src.gnome.org>
Date: Mon, 4 Oct 2004 11:53:20 +0000
Subject: [PATCH] applied patch from Malcolm Tredinnick fixing bug #152426
 Daniel

* parser.c: applied patch from Malcolm Tredinnick fixing bug #152426
Daniel
---
 ChangeLog | 4 ++++
 parser.c  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c77c1c68..3ca161f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Oct  4 13:53:24 CEST 2004 Daniel Veillard <daniel@veillard.com>
+
+	* parser.c: applied patch from Malcolm Tredinnick fixing bug #152426
+
 Mon Oct  4 12:26:28 CEST 2004 Daniel Veillard <daniel@veillard.com>
 
 	* python/generator.py python/libxml.c python/tests/outbuf.py: 
diff --git a/parser.c b/parser.c
index e1523c05..2b8f5edd 100644
--- a/parser.c
+++ b/parser.c
@@ -10219,7 +10219,7 @@ xmlSAXParseDTD(xmlSAXHandlerPtr sax, const xmlChar *ExternalID,
      * Canonicalise the system ID
      */
     systemIdCanonic = xmlCanonicPath(SystemID);
-    if (systemIdCanonic == NULL) {
+    if ((SystemID != NULL) && (systemIdCanonic == NULL)) {
 	xmlFreeParserCtxt(ctxt);
 	return(NULL);
     }