зеркало из https://github.com/mozilla/pjs.git
Make sure id array are GC-protected. bug=351973 r=mrbkap sr=brendan
This commit is contained in:
Родитель
ee901d127c
Коммит
cde829c661
|
@ -553,8 +553,10 @@ js_EnterSharpObject(JSContext *cx, JSObject *obj, JSIdArray **idap,
|
|||
return NULL;
|
||||
}
|
||||
map->table = table;
|
||||
JS_KEEP_ATOMS(cx->runtime);
|
||||
}
|
||||
|
||||
/* From this point the control must flow either through out: or bad:. */
|
||||
ida = NULL;
|
||||
if (map->depth == 0) {
|
||||
he = MarkSharpObjects(cx, obj, &ida);
|
||||
|
@ -624,6 +626,7 @@ out:
|
|||
bad:
|
||||
/* Clean up the sharpObjectMap table on outermost error. */
|
||||
if (map->depth == 0) {
|
||||
JS_UNKEEP_ATOMS(cx->runtime);
|
||||
map->sharpgen = 0;
|
||||
JS_HashTableDestroy(map->table);
|
||||
map->table = NULL;
|
||||
|
@ -640,6 +643,7 @@ js_LeaveSharpObject(JSContext *cx, JSIdArray **idap)
|
|||
map = &cx->sharpObjectMap;
|
||||
JS_ASSERT(map->depth > 0);
|
||||
if (--map->depth == 0) {
|
||||
JS_UNKEEP_ATOMS(cx->runtime);
|
||||
map->sharpgen = 0;
|
||||
JS_HashTableDestroy(map->table);
|
||||
map->table = NULL;
|
||||
|
|
Загрузка…
Ссылка в новой задаче