lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00
Code Activity

fixed xmlFAParseCharRange for Unicode ranges with patch from Charles

Browse Source 
* xmlregexp.c: fixed xmlFAParseCharRange for Unicode ranges
  with patch from Charles Bozeman.
This commit is contained in:
William M. Brack
2003-12-27 01:54:25 +00:00
parent 9887395b55
commit dc99df936c
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Dec 27 09:53:06 HKT 2003 William Brack <wbrack@mmm.com.hk>
* xmlregexp.c: fixed xmlFAParseCharRange for Unicode ranges
with patch from Charles Bozeman.
Fri Dec 26 14:03:41 HKT 2003 William Brack <wbrack@mmm.com.hk> Fri Dec 26 14:03:41 HKT 2003 William Brack <wbrack@mmm.com.hk>
* xmlregexp.c: fixed problem causing segfault on validation error * xmlregexp.c: fixed problem causing segfault on validation error

12
xmlregexp.c
View File

@ -3533,7 +3533,7 @@ xmlFAParseCharRef(xmlRegParserCtxtPtr ctxt) {
*/ */
static void static void
xmlFAParseCharRange(xmlRegParserCtxtPtr ctxt) { xmlFAParseCharRange(xmlRegParserCtxtPtr ctxt) {
int cur; int cur, len;
int start = -1; int start = -1;
int end = -1; int end = -1;
@ -3560,13 +3560,14 @@ xmlFAParseCharRange(xmlRegParserCtxtPtr ctxt) {
return; return;
} }
end = start; end = start;
len = 1;
} else if ((cur != 0x5B) && (cur != 0x5D)) { } else if ((cur != 0x5B) && (cur != 0x5D)) {
end = start = cur; end = start = CUR_SCHAR(ctxt->cur, len);
} else { } else {
ERROR("Expecting a char range"); ERROR("Expecting a char range");
return; return;
} }
NEXT; NEXTL(len);
if (start == '-') { if (start == '-') {
return; return;
} }
@ -3593,13 +3594,14 @@ xmlFAParseCharRange(xmlRegParserCtxtPtr ctxt) {
ERROR("Invalid escape value"); ERROR("Invalid escape value");
return; return;
} }
len = 1;
} else if ((cur != 0x5B) && (cur != 0x5D)) { } else if ((cur != 0x5B) && (cur != 0x5D)) {
end = cur; end = CUR_SCHAR(ctxt->cur, len);
} else { } else {
ERROR("Expecting the end of a char range"); ERROR("Expecting the end of a char range");
return; return;
} }
NEXT; NEXTL(len);
/* TODO check that the values are acceptable character ranges for XML */ /* TODO check that the values are acceptable character ranges for XML */
if (end < start) { if (end < start) {
ERROR("End of range is before start of range"); ERROR("End of range is before start of range");