From 1ad338a074c5bbd97265da16194ae266d8258caa Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Fri, 14 Aug 2009 10:59:49 +0000
Subject: [PATCH] Little more paranoia in js_load().
---
src/sbbs3/js_global.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/sbbs3/js_global.c b/src/sbbs3/js_global.c
index 3768fba127..a5cb40c7d8 100644
--- a/src/sbbs3/js_global.c
+++ b/src/sbbs3/js_global.c
@@ -347,7 +347,7 @@ js_load(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
SAFECOPY(path,filename);
else {
path[0]=0;
- if(JS_GetProperty(cx, obj, "js", &val)) {
+ if(JS_GetProperty(cx, obj, "js", &val) && JSVAL_IS_OBJECT(val)) {
JSObject* js = JSVAL_TO_OBJECT(val);
if(JS_GetProperty(cx, js, JAVASCRIPT_LOAD_PATH_LIST, &val) && JSVAL_IS_OBJECT(val)) {
JSObject* list = JSVAL_TO_OBJECT(val);
@@ -3568,6 +3568,4 @@ JSObject* DLLCALL js_CreateCommonObjects(JSContext* js_cx
return(js_glob);
}
-
-
#endif /* JAVSCRIPT */
--
GitLab