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 530240 followup. Can't assume vp[1] is an object here, in fact. Fixes orange.

Browse Source
This commit is contained in:
Boris Zbarsky 2009-12-03 23:35:36 -05:00
parent b811feadbc
commit b346e737a5
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
js/src/jsstr.cpp
View File

@ -653,17 +653,20 @@ NormalizeThis(JSContext *cx, jsval *vp)
/*
* js_GetPrimitiveThis seems to do a bunch of work (like calls to
* JS_THIS_OBJECT) which we don't need in the common case (where
* vp[1] is a String object) here.
* vp[1] is a String object) here. Note that vp[1] can still be a
* primitive value at this point.
*/
JS_ASSERT(!JSVAL_IS_PRIMITIVE(vp[1]));
JSObject *obj = JSVAL_TO_OBJECT(vp[1]);
if (obj->getClass() == &js_StringClass) {
str = JSVAL_TO_STRING(obj->fslots[JSSLOT_PRIMITIVE_THIS]);
} else {
str = js_ValueToString(cx, vp[1]);
if (!str)
return NULL;
if (!JSVAL_IS_PRIMITIVE(vp[1])) {
JSObject *obj = JSVAL_TO_OBJECT(vp[1]);
if (obj->getClass() == &js_StringClass) {
vp[1] = obj->fslots[JSSLOT_PRIMITIVE_THIS];
return JSVAL_TO_STRING(vp[1]);
}
}
str = js_ValueToString(cx, vp[1]);
if (!str)
return NULL;
vp[1] = STRING_TO_JSVAL(str);
return str;
}