ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Don't use jsstr_t in JSRegExp structure.

This commit is contained in:
Piotr Caban 2013-02-15 14:04:29 +01:00 committed by Alexandre Julliard
parent 02d63cb312
commit 89711e35c1
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/jscript/regexp.c
View File

@ -74,7 +74,8 @@ typedef struct {
size_t parenCount; /* number of parenthesized submatches */ size_t parenCount; /* number of parenthesized submatches */
size_t classCount; /* count [...] bitmaps */ size_t classCount; /* count [...] bitmaps */
RECharSet *classList; /* list of [...] bitmaps */ RECharSet *classList; /* list of [...] bitmaps */
jsstr_t *source; /* locked source string, sans // */ const WCHAR *source; /* locked source string, sans // */
DWORD source_len;
jsbytecode program[1]; /* regular expression bytecode */ jsbytecode program[1]; /* regular expression bytecode */
} JSRegExp; } JSRegExp;
@ -2038,7 +2039,7 @@ PushBackTrackState(REGlobalData *gData, REOp op,
} }
static inline REMatchState * static inline REMatchState *
FlatNIMatcher(REGlobalData *gData, REMatchState *x, WCHAR *matchChars, FlatNIMatcher(REGlobalData *gData, REMatchState *x, const WCHAR *matchChars,
size_t length) size_t length)
{ {
size_t i; size_t i;
@ -2157,13 +2158,12 @@ ProcessCharSet(REGlobalData *gData, RECharSet *charSet)
* source string. * source string.
*/ */
assert(1 <= charSet->u.src.startIndex); assert(1 <= charSet->u.src.startIndex);
assert(charSet->u.src.startIndex assert(charSet->u.src.startIndex < gData->regexp->source_len);
< jsstr_length(gData->regexp->source)); assert(charSet->u.src.length <= gData->regexp->source_len
assert(charSet->u.src.length <= jsstr_length(gData->regexp->source) - 1 - charSet->u.src.startIndex);
- 1 - charSet->u.src.startIndex);
charSet->converted = TRUE; charSet->converted = TRUE;
src = gData->regexp->source->str + charSet->u.src.startIndex; src = gData->regexp->source + charSet->u.src.startIndex;
end = src + charSet->u.src.length; end = src + charSet->u.src.length;
@ -2392,7 +2392,7 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op,
size_t parenIndex; size_t parenIndex;
size_t offset, length, index; size_t offset, length, index;
jsbytecode *pc = *startpc; /* pc has already been incremented past op */ jsbytecode *pc = *startpc; /* pc has already been incremented past op */
WCHAR *source; const WCHAR *source;
const WCHAR *startcp = x->cp; const WCHAR *startcp = x->cp;
WCHAR ch; WCHAR ch;
RECharSet *charSet; RECharSet *charSet;
@ -2488,12 +2488,12 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op,
break; break;
case REOP_FLAT: case REOP_FLAT:
pc = ReadCompactIndex(pc, &offset); pc = ReadCompactIndex(pc, &offset);
assert(offset < jsstr_length(gData->regexp->source)); assert(offset < gData->regexp->source_len);
pc = ReadCompactIndex(pc, &length); pc = ReadCompactIndex(pc, &length);
assert(1 <= length); assert(1 <= length);
assert(length <= jsstr_length(gData->regexp->source) - offset); assert(length <= gData->regexp->source_len - offset);
if (length <= (size_t)(gData->cpend - x->cp)) { if (length <= (size_t)(gData->cpend - x->cp)) {
source = gData->regexp->source->str + offset; source = gData->regexp->source + offset;
TRACE("%s\n", debugstr_wn(source, length)); TRACE("%s\n", debugstr_wn(source, length));
for (index = 0; index != length; index++) { for (index = 0; index != length; index++) {
if (source[index] != x->cp[index]) if (source[index] != x->cp[index])
@ -2513,11 +2513,11 @@ SimpleMatch(REGlobalData *gData, REMatchState *x, REOp op,
break; break;
case REOP_FLATi: case REOP_FLATi:
pc = ReadCompactIndex(pc, &offset); pc = ReadCompactIndex(pc, &offset);
assert(offset < jsstr_length(gData->regexp->source)); assert(offset < gData->regexp->source_len);
pc = ReadCompactIndex(pc, &length); pc = ReadCompactIndex(pc, &length);
assert(1 <= length); assert(1 <= length);
assert(length <= jsstr_length(gData->regexp->source) - offset); assert(length <= gData->regexp->source_len - offset);
source = gData->regexp->source->str; source = gData->regexp->source;
result = FlatNIMatcher(gData, x, source + offset, length); result = FlatNIMatcher(gData, x, source + offset, length);
break; break;
case REOP_FLAT1i: case REOP_FLAT1i:
@ -3303,7 +3303,8 @@ js_NewRegExp(script_ctx_t *cx, jsstr_t *str, UINT flags, BOOL flat)
re->flags = flags; re->flags = flags;
re->parenCount = state.parenCount; re->parenCount = state.parenCount;
re->source = str; re->source = str->str;
re->source_len = jsstr_length(str);
out: out:
heap_pool_clear(mark); heap_pool_clear(mark);