From ceb09b956efa2cf1ec41c1887394396e5a6030f2 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Fri, 4 Oct 2002 11:46:37 +0000 Subject: [PATCH] typo/bug found by Christian Glahn Daniel * valid.c: typo/bug found by Christian Glahn Daniel --- ChangeLog | 4 ++++ valid.c | 2 +- xpath.c | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 082c8487..096c6a8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Oct 4 13:43:02 CEST 2002 Daniel Veillard + + * valid.c: typo/bug found by Christian Glahn + Sun Sep 29 19:44:10 CEST 2002 Igor Zlatkovic * xmlIO.c: applied Windows CE patch from Javier. diff --git a/valid.c b/valid.c index 58ab756b..196ea2b9 100644 --- a/valid.c +++ b/valid.c @@ -4837,7 +4837,7 @@ xmlValidateOneCdataElement(xmlValidCtxtPtr ctxt, xmlDocPtr doc, int ret = 1; xmlNodePtr cur, child; - if ((ctxt == NULL) || (doc == NULL) | (elem == NULL)) + if ((ctxt == NULL) || (doc == NULL) || (elem == NULL)) return(0); child = elem->children; diff --git a/xpath.c b/xpath.c index e754d6f5..eac09371 100644 --- a/xpath.c +++ b/xpath.c @@ -10582,13 +10582,13 @@ xmlXPathCompile(const xmlChar *str) { ctxt->comp = NULL; } xmlXPathFreeParserContext(ctxt); - comp->expr = xmlStrdup(str); -#ifdef DEBUG_EVAL_COUNTS if (comp != NULL) { + comp->expr = xmlStrdup(str); +#ifdef DEBUG_EVAL_COUNTS comp->string = xmlStrdup(str); comp->nb = 0; - } #endif + } return(comp); }