From 324feb4a6e2f698a9c7b1ba45759da45309ac13b Mon Sep 17 00:00:00 2001 From: sbbs <> Date: Fri, 12 Aug 2011 23:26:17 +0000 Subject: [PATCH] Bug-fix: js.global was null when compiled with one version of libjs headers but run with a different version of libjs.so. --- src/sbbs3/js_internal.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/sbbs3/js_internal.c b/src/sbbs3/js_internal.c index 23ce78a8ba..f096aa79db 100644 --- a/src/sbbs3/js_internal.c +++ b/src/sbbs3/js_internal.c @@ -109,14 +109,10 @@ static JSBool js_get(JSContext *cx, JSObject *obj, jsval id, jsval *vp) case PROP_MAXBYTES: JS_NewNumberValue(cx,cx->runtime->gcMaxBytes,vp); break; +#endif case PROP_GLOBAL: - *vp = OBJECT_TO_JSVAL(cx->globalObject); - break; -#else - case PROP_GLOBAL: - *vp = OBJECT_TO_JSVAL(JS_GetParent(cx,obj)); + *vp = OBJECT_TO_JSVAL(JS_GetGlobalObject(cx)); break; -#endif } return(JS_TRUE); -- GitLab