From 9d0070c8ef6935eb703664765aedbf62043b95c1 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Thu, 13 Mar 2003 02:59:37 +0000
Subject: [PATCH] Reverted to load() erroring-out parent if loaded script fails
to compile. load() now returns the result of the executed script.
---
src/sbbs3/js_global.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/sbbs3/js_global.c b/src/sbbs3/js_global.c
index 65b0f8f04f..b89270eb19 100644
--- a/src/sbbs3/js_global.c
+++ b/src/sbbs3/js_global.c
@@ -85,6 +85,7 @@ js_load(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
jsval result;
scfg_t* cfg;
JSObject* js_argv;
+ JSBool success;
*rval=JSVAL_FALSE;
@@ -119,12 +120,17 @@ js_load(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
JS_ClearPendingException(cx);
if((script=JS_CompileFile(cx, obj, path))==NULL)
- return(JS_TRUE);
+ return(JS_FALSE);
- *rval = BOOLEAN_TO_JSVAL(JS_ExecuteScript(cx, obj, script, &result));
+ success = JS_ExecuteScript(cx, obj, script, &result);
JS_DestroyScript(cx, script);
+ if(!success)
+ return(JS_FALSE);
+
+ *rval = result;
+
return(JS_TRUE);
}
--
GitLab