summaryrefslogtreecommitdiff
path: root/xmlregexp.c
diff options
context:
space:
mode:
authorMike Hommey <glandium@debian.org>2009-09-25 22:17:31 +0200
committerMike Hommey <glandium@debian.org>2009-09-25 22:17:31 +0200
commit67a17fecb5b5fe2058af6405bc9601875f3e75a1 (patch)
tree73a7ed49173098b5c59eeb8a33747d3b803d2309 /xmlregexp.c
parentc3e4f3c26035bc93a69e5aa2ad435809e8be8a4e (diff)
downloadlibxml2-67a17fecb5b5fe2058af6405bc9601875f3e75a1.tar.gz
Import upstream version 2.7.5upstream/2.7.5.dfsg
Diffstat (limited to 'xmlregexp.c')
-rw-r--r--xmlregexp.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/xmlregexp.c b/xmlregexp.c
index a10bf6b..2a501ad 100644
--- a/xmlregexp.c
+++ b/xmlregexp.c
@@ -2095,12 +2095,13 @@ xmlFACompareRanges(xmlRegRangePtr range1, xmlRegRangePtr range2) {
(range2->type == XML_REGEXP_EPSILON)) {
return(0);
} else if (range1->type == range2->type) {
- if ((range1->type != XML_REGEXP_CHARVAL) ||
- (range1->end < range2->start) ||
- (range2->end < range1->start))
- ret = 1;
- else
+ if (range1->type != XML_REGEXP_CHARVAL)
+ ret = 1;
+ else if ((range1->end < range2->start) ||
+ (range2->end < range1->start))
ret = 0;
+ else
+ ret = 1;
} else if (range1->type == XML_REGEXP_CHARVAL) {
int codepoint;
int neg = 0;