From ed939f8e065a708cafb7f653b7301c22bc2786c0 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Tue, 8 Apr 2008 08:20:08 +0000 Subject: [PATCH] fix a bug introduced when fixing #438208 and reported by Ashwin fix an * tree.c: fix a bug introduced when fixing #438208 and reported by Ashwin * python/generator.py: fix an infinite loop bug Daniel svn path=/trunk/; revision=3733 --- ChangeLog | 6 ++++++ python/generator.py | 3 +++ tree.c | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 576939f5..4da35e4b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Apr 8 10:19:01 CEST 2008 Daniel Veillard + + * tree.c: fix a bug introduced when fixing #438208 and reported by + Ashwin + * python/generator.py: fix an infinite loop bug + Mon Apr 7 14:44:51 CEST 2008 Daniel Veillard * xmlreader.c: fix a link to XmlNodeType doc reported by Martijn Arts diff --git a/python/generator.py b/python/generator.py index a38a23c5..8cf327b6 100755 --- a/python/generator.py +++ b/python/generator.py @@ -849,6 +849,9 @@ def writeDoc(name, args, indent, output): output.write(indent) output.write('"""') while len(val) > 60: + if val[0] == " ": + val = val[1:] + continue str = val[0:60] i = string.rfind(str, " "); if i < 0: diff --git a/tree.c b/tree.c index 3b7d25d0..763381b8 100644 --- a/tree.c +++ b/tree.c @@ -1785,7 +1785,7 @@ xmlNewPropInternal(xmlNodePtr node, xmlNsPtr ns, if ((node != NULL) && (node->type != XML_ELEMENT_NODE)) { if ((eatname == 1) && ((node->doc == NULL) || - (!(xmlDictOwns(node->doc->dict, name) == 0)))) + (!(xmlDictOwns(node->doc->dict, name))))) xmlFree((xmlChar *) name); return (NULL); } @@ -1797,7 +1797,7 @@ xmlNewPropInternal(xmlNodePtr node, xmlNsPtr ns, if (cur == NULL) { if ((eatname == 1) && ((node->doc == NULL) || - (!(xmlDictOwns(node->doc->dict, name) == 0)))) + (!(xmlDictOwns(node->doc->dict, name))))) xmlFree((xmlChar *) name); xmlTreeErrMemory("building attribute"); return (NULL);