From a9cbf28361410926c82ae47a2c9d1a22795976c1 Mon Sep 17 00:00:00 2001
From: "William M. Brack" <wbrack@src.gnome.org>
Date: Wed, 21 Mar 2007 13:16:33 +0000
Subject: [PATCH] fixed problem with 0x2d in Char Range (bug #420596) added
 regression test

* xmlregexp.c: fixed problem with 0x2d in Char Range (bug #420596)
* test/regexp/bug420596, result/regexp/bug420596: added regression
  test for this

svn path=/trunk/; revision=3594
---
 ChangeLog               |  6 ++++++
 result/regexp/bug420596 | 10 ++++++++++
 test/regexp/bug420596   | 10 ++++++++++
 xmlregexp.c             | 14 ++++++++++++--
 4 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 result/regexp/bug420596
 create mode 100644 test/regexp/bug420596

diff --git a/ChangeLog b/ChangeLog
index 10de3652..3a23f357 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar 21 21:20:48 HKT 2007 William Brack <wbrack@mmm.com.hk>
+
+	* xmlregexp.c: fixed problem with 0x2d in Char Range (bug #420596)
+	* test/regexp/bug420596, result/regexp/bug420596: added regression
+	  test for this
+
 Wed Mar 21 14:23:08 HKT 2007 William Brack <wbrack@mmm.com.hk>
 
 	* HTMLparser.c: fixed memory access error on parsing of meta data
diff --git a/result/regexp/bug420596 b/result/regexp/bug420596
new file mode 100644
index 00000000..d23b3031
--- /dev/null
+++ b/result/regexp/bug420596
@@ -0,0 +1,10 @@
+Regexp: (\+|-)(0[0-9]|1[0-1])
++01: Ok
+-01: Ok
++10: Ok
+-10: Ok
+Regexp: [+-](0[0-9]|1[0-1])
++01: Ok
+-01: Ok
++10: Ok
+-10: Ok
diff --git a/test/regexp/bug420596 b/test/regexp/bug420596
new file mode 100644
index 00000000..b6f285d5
--- /dev/null
+++ b/test/regexp/bug420596
@@ -0,0 +1,10 @@
+=>(\+|-)(0[0-9]|1[0-1])
++01
+-01
++10
+-10
+=>[+-](0[0-9]|1[0-1])
++01
+-01
++10
+-10
diff --git a/xmlregexp.c b/xmlregexp.c
index fbd0e9f3..784798d7 100644
--- a/xmlregexp.c
+++ b/xmlregexp.c
@@ -54,6 +54,11 @@
 #define CUR_SCHAR(s, l) xmlStringCurrentChar(NULL, s, &l)
 #define NEXTL(l) ctxt->cur += l;
 #define XML_REG_STRING_SEPARATOR '|'
+/*
+ * Need PREV to check on a '-' within a Character Group. May only be used
+ * when it's guaranteed that cur is not at the beginning of ctxt->string!
+ */
+#define PREV (ctxt->cur[-1])
 
 /**
  * TODO:
@@ -4853,10 +4858,15 @@ xmlFAParseCharRange(xmlRegParserCtxtPtr ctxt) {
 	ERROR("Expecting a char range");
 	return;
     }
-    NEXTL(len);
-    if (start == '-') {
+    /*
+     * Since we are "inside" a range, we can assume ctxt->cur is past
+     * the start of ctxt->string, and PREV should be safe
+     */
+    if ((start == '-') && (NXT(1) != ']') && (PREV != '[') && (PREV != '^')) {
+	NEXTL(len);
 	return;
     }
+    NEXTL(len);
     cur = CUR;
     if ((cur != '-') || (NXT(1) == ']')) {
         xmlRegAtomAddRange(ctxt, ctxt->atom, ctxt->neg,