wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 836087 - Avoid using doubles for lastIndex in ExecuteRegExp(). r=nbp

Browse Source
This commit is contained in:
Sean Stangl 2013-01-31 13:43:06 -08:00
parent 5e92dda918
commit 827c6ac92a
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
js/src/builtin/RegExp.cpp
View File

@ -559,20 +559,34 @@ js::ExecuteRegExp(JSContext *cx, HandleObject regexp, HandleString string, Match
/* Step 4. */ /* Step 4. */
Value lastIndex = reobj->getLastIndex(); Value lastIndex = reobj->getLastIndex();
StableCharPtr chars = stableInput->chars();
size_t length = stableInput->length();
/* Step 5. */ /* Step 5. */
double i; int i;
if (!ToInteger(cx, lastIndex, &i)) if (lastIndex.isInt32()) {
return RegExpRunStatus_Error; /* Aggressively avoid doubles. */
i = lastIndex.toInt32();
} else {
double d;
if (!ToInteger(cx, lastIndex, &d))
return RegExpRunStatus_Error;
/* Inlined steps 6, 7, 9a with doubles to detect failure case. */
if ((re->global() || re->sticky()) && (d < 0 || d > length)) {
reobj->zeroLastIndex();
return RegExpRunStatus_Success_NotFound;
}
i = int(d);
}
/* Steps 6-7 (with sticky extension). */ /* Steps 6-7 (with sticky extension). */
if (!re->global() && !re->sticky()) if (!re->global() && !re->sticky())
i = 0; i = 0;
StableCharPtr chars = stableInput->chars();
size_t length = stableInput->length();
/* Step 9a. */ /* Step 9a. */
if (i < 0 || i > length) { if (i < 0 || size_t(i) > length) {
reobj->zeroLastIndex(); reobj->zeroLastIndex();
return RegExpRunStatus_Success_NotFound; return RegExpRunStatus_Success_NotFound;
} }