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 887334 - Rejigger the string manipulation in OnJSContextNew to avoid depending on being in a compartment. r=luke

Browse Source 
The current code makes calls that assume (implicitly, via assertions) that |cx|
is in a compartment, which isn't a valid assumption going forward.
This commit is contained in:
Bobby Holley 2013-07-17 11:53:51 -07:00
parent ea06c3d7e0
commit 18c1d08a65
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/xpconnect/src/XPCJSRuntime.cpp
View File

@ -2648,10 +2648,11 @@ XPCJSRuntime::OnJSContextNew(JSContext *cx)
RootedString str(cx); RootedString str(cx);
for (unsigned i = 0; i < IDX_TOTAL_COUNT; i++) { for (unsigned i = 0; i < IDX_TOTAL_COUNT; i++) {
str = JS_InternString(cx, mStrings[i]); str = JS_InternString(cx, mStrings[i]);
if (!str || !JS_ValueToId(cx, STRING_TO_JSVAL(str), &mStrIDs[i])) { if (!str) {
mStrIDs[0] = JSID_VOID; mStrIDs[0] = JSID_VOID;
return false; return false;
} }
mStrIDs[i] = INTERNED_STRING_TO_JSID(cx, str);
mStrJSVals[i] = STRING_TO_JSVAL(str); mStrJSVals[i] = STRING_TO_JSVAL(str);
} }