From 9283167963fa976f6ddf443bd18bace6fcd4d11d Mon Sep 17 00:00:00 2001 From: David Mandelin Date: Tue, 25 May 2010 14:54:16 -0700 Subject: [PATCH] Fix jsreftest regress-520572.js --- js/src/jsapi.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/jsapi.cpp b/js/src/jsapi.cpp index 19ee4eb3516..25c8ce70ccc 100644 --- a/js/src/jsapi.cpp +++ b/js/src/jsapi.cpp @@ -2681,7 +2681,7 @@ JS_PUBLIC_API(JSBool) JS_SetParent(JSContext *cx, JSObject *obj, JSObject *parent) { CHECK_REQUEST(cx); - JS_ASSERT(!parent->isFunction() && + JS_ASSERT((!parent || !parent->isFunction()) && "Functions may not be set as the parents of objects."); return js_SetProtoOrParent(cx, obj, JSSLOT_PARENT, parent, JS_FALSE); }