From bc6feecd1019371070bd74814d45de2b905f3917 Mon Sep 17 00:00:00 2001 From: "igor@mir2.org" Date: Sun, 12 Aug 2007 15:11:38 -0700 Subject: [PATCH] Bug 391851: JS_ResolveStandardClass now does nothing on shutdown. r=brendan --- js/src/jsapi.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/js/src/jsapi.c b/js/src/jsapi.c index ce4913d1ec59..cd50a6a6d2f6 100644 --- a/js/src/jsapi.c +++ b/js/src/jsapi.c @@ -1440,10 +1440,12 @@ JS_ResolveStandardClass(JSContext *cx, JSObject *obj, jsval id, CHECK_REQUEST(cx); *resolved = JS_FALSE; - if (!JSVAL_IS_STRING(id)) - return JS_TRUE; - idstr = JSVAL_TO_STRING(id); rt = cx->runtime; + JS_ASSERT(rt->state != JSRTS_DOWN); + if (rt->state == JSRTS_LANDING || !JSVAL_IS_STRING(id)) + return JS_TRUE; + + idstr = JSVAL_TO_STRING(id); /* Check whether we're resolving 'undefined', and define it if so. */ atom = rt->atomState.typeAtoms[JSTYPE_VOID];