Skip to content

regexp.c: minor fixes for UTF8 strings matching #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

regexp.c: minor fixes for UTF8 strings matching #7

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43d0974
regexp.c: minor fixes for UTF8 strings matching
justadreamer Aug 30, 2015
cd2daec
added pcre error code to error reporting
justadreamer Aug 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions regexp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
* Authors:
* Joel W. Reed <[email protected]>
* Some modification by Kyle Maxwell
* Minor fix for UTF8 strings by Eugene Dorfman <[email protected]>
*
* TODO:
* functions:
Expand Down Expand Up @@ -66,13 +67,13 @@ exsltRegexpExecute(xmlXPathParserContextPtr ctxt,
haystack, /* the subject string */
haystack_len, /* the length of the subject string */
0, /* start at offset 0 in the subject */
0, /* default options */
PCRE_NO_UTF8_CHECK, /* default options */
(int*)ovector, /* vector of integers for substring information */
ovector_len); /* number of elements in the vector (NOT size in bytes) */

if (rc < -1) {
xsltTransformError (xsltXPathGetTransformContext (ctxt), NULL, NULL,
"exslt:regexp failed to execute %s for %s", regexp, haystack);
"exslt:regexp failed to execute %s for %s with error code: %d ", regexp, haystack, rc);
rc = 0;
}

Expand Down Expand Up @@ -149,8 +150,8 @@ exsltRegexpMatchFunction (xmlXPathParserContextPtr ctxt, int nargs)

while (rc > 0) {
for(int group = 0; group < rc; group++) {
match = xmlStrsub(working, ovector[group*2], ovector[group*2+1]-ovector[group*2]);
if (NULL == match) goto fail;
match = xmlUTF8Strsub(working, ovector[group*2], ovector[group*2+1]-ovector[group*2]);
if (NULL == match || 0 == xmlUTF8Strlen(match)) goto fail;

node = xmlNewDocRawNode(container, NULL, "match", match);
xmlFree(match);
Expand All @@ -160,7 +161,7 @@ exsltRegexpMatchFunction (xmlXPathParserContextPtr ctxt, int nargs)
}
if (!global) break;

working = working + ovector[1];
working = xmlUTF8Strpos(working,ovector[1]);
rc = exsltRegexpExecute(ctxt, working, regexp, flags,
ovector, sizeof(ovector)/sizeof(int));
}
Expand Down