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

Reload 'entry' after JS_NewObject, since a nested GC could cause our hashtable to reallocate its store. bug 445229, r+sr=jst

Browse Source
This commit is contained in:
Blake Kaplan 2008-07-23 12:49:29 -04:00
parent c21fd6d356
commit 33bb384e59
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/plugin/base/src/nsJSNPRuntime.cpp
View File

@ -1717,10 +1717,22 @@ nsNPObjWrapper::GetNewOrUsed(NPP npp, JSContext *cx, NPObject *npobj)
JSAutoRequest ar(cx);
PRUint32 generation = sNPObjWrappers.generation;
// No existing JSObject, create one.
JSObject *obj = ::JS_NewObject(cx, &sNPObjectJSWrapperClass, nsnull, nsnull);
if (generation != sNPObjWrappers.generation) {
// Reload entry if the JS_NewObject call caused a GC and reallocated
// the table (see bug 445229). This is guaranteed to succeed.
entry = static_cast<NPObjWrapperHashEntry *>
(PL_DHashTableOperate(&sNPObjWrappers, npobj, PL_DHASH_LOOKUP));
NS_ASSERTION(entry && PL_DHASH_ENTRY_IS_BUSY(entry),
"Hashtable didn't find what we just added?");
}
if (!obj) {
// OOM? Remove the stale entry from the hash.