summaryrefslogtreecommitdiff
path: root/xmlregexp.c
diff options
context:
space:
mode:
authorMike Hommey <glandium@debian.org>2005-07-12 19:58:48 +0000
committerMike Hommey <glandium@debian.org>2005-07-12 19:58:48 +0000
commit112cb5bb5475afec1c1cbf1d6728ce4880d0fee8 (patch)
tree6c34596134f8665ebc180f29b50915dc70bbe5c1 /xmlregexp.c
parent0fc063df3ab2ad380d532d210dd1001de473e51b (diff)
downloadlibxml2-112cb5bb5475afec1c1cbf1d6728ce4880d0fee8.tar.gz
Load /tmp/tmp.zfIyNk/libxml2-2.6.20 intoupstream/2.6.20
packages/libxml2/branches/upstream/current.
Diffstat (limited to 'xmlregexp.c')
-rw-r--r--xmlregexp.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/xmlregexp.c b/xmlregexp.c
index 495f1c5..ee635f1 100644
--- a/xmlregexp.c
+++ b/xmlregexp.c
@@ -749,7 +749,9 @@ xmlRegFreeAtom(xmlRegAtomPtr atom) {
xmlRegFreeRange(atom->ranges[i]);
if (atom->ranges != NULL)
xmlFree(atom->ranges);
- if (atom->type == XML_REGEXP_STRING)
+ if ((atom->type == XML_REGEXP_STRING) && (atom->valuep != NULL))
+ xmlFree(atom->valuep);
+ if ((atom->type == XML_REGEXP_BLOCK_NAME) && (atom->valuep != NULL))
xmlFree(atom->valuep);
xmlFree(atom);
}
@@ -2635,14 +2637,14 @@ xmlRegStrEqualWildcard(const xmlChar *expStr, const xmlChar *valStr) {
do {
if (*valStr == XML_REG_STRING_SEPARATOR)
break;
- *valStr++;
+ valStr++;
} while (*valStr != 0);
continue;
} else
return(0);
}
- *expStr++;
- *valStr++;
+ expStr++;
+ valStr++;
} while (*valStr != 0);
if (*expStr != 0)
return (0);