From 95a07b236294a366334810338cb0de7fc3be0e3e Mon Sep 17 00:00:00 2001 From: "Rob Swindell (on Debian Linux)" <rob@synchro.net> Date: Fri, 10 Feb 2023 21:49:53 -0800 Subject: [PATCH] Fix crash when getting file area web_file_prefix in JSexec js_init was assuming that startup != NULL --- src/sbbs3/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sbbs3/main.cpp b/src/sbbs3/main.cpp index 8f1f83130e..caa81c43bf 100644 --- a/src/sbbs3/main.cpp +++ b/src/sbbs3/main.cpp @@ -1412,7 +1412,7 @@ bool sbbs_t::js_create_user_objects(JSContext* cx, JSObject* glob) bool result = false; if(cx != NULL) { JS_BEGINREQUEST(cx); - if(!js_CreateUserObjects(cx, glob, &cfg, &useron, &client, startup->web_file_vpath_prefix, subscan)) + if(!js_CreateUserObjects(cx, glob, &cfg, &useron, &client, startup == NULL ? NULL :startup->web_file_vpath_prefix, subscan)) lprintf(LOG_ERR,"!JavaScript ERROR creating user objects"); else result = true; @@ -1517,7 +1517,7 @@ extern "C" BOOL js_CreateCommonObjects(JSContext* js_cx break; /* Area Objects */ - if(!js_CreateUserObjects(js_cx, *glob, cfg, /* user: */NULL, client, startup->web_file_vpath_prefix, /* subscan: */NULL)) + if(!js_CreateUserObjects(js_cx, *glob, cfg, /* user: */NULL, client, startup == NULL ? NULL :startup->web_file_vpath_prefix, /* subscan: */NULL)) break; success=TRUE; -- GitLab