summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Veillard <veillard@src.gnome.org>2006-02-24 20:22:27 +0000
committerDaniel Veillard <veillard@src.gnome.org>2006-02-24 20:22:27 +0000
commit27bec1461b16aa0e9016337723584c62ae179e8a (patch)
treed02993c1aad5aa7e85d0df5435299d3ef0a46c23
parentd463c99fd8ff26a41be5c4c3b96bed90a900e84e (diff)
downloadlibxml2-27bec1461b16aa0e9016337723584c62ae179e8a.tar.gz
Martin Cole pointed out a bug in xmlCatalogAdd() if /etc/xml/catalog
* catalog.c: Martin Cole pointed out a bug in xmlCatalogAdd() if /etc/xml/catalog doesn't exist. Daniel
-rw-r--r--ChangeLog5
-rw-r--r--catalog.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index abe7d1b7..b0ea26dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 24 21:20:33 CET 2006 Daniel Veillard <daniel@veillard.com>
+
+ * catalog.c: Martin Cole pointed out a bug in xmlCatalogAdd()
+ if /etc/xml/catalog doesn't exist.
+
Thu Feb 23 23:06:18 CET 2006 Daniel Veillard <daniel@veillard.com>
* doc//*: updated the Ruby bindings links, and regenerated the
diff --git a/catalog.c b/catalog.c
index 8f8898bb..7aea5714 100644
--- a/catalog.c
+++ b/catalog.c
@@ -1546,6 +1546,7 @@ xmlAddXMLCatalog(xmlCatalogEntryPtr catal, const xmlChar *type,
cur->next = xmlNewCatalogEntry(typ, orig, replace,
NULL, catal->prefer, NULL);
if (doregister) {
+ catal->type = XML_CATA_CATALOG;
cur = xmlHashLookup(xmlCatalogXMLFiles, catal->URL);
if (cur != NULL)
cur->children = catal->children;