diff --git a/src/sbbs3/js_bbs.cpp b/src/sbbs3/js_bbs.cpp
index 21cd46d1a4b49e483ae1dc057d6939a408257046..c80268a7fbc4fc7df3f7d23942b32c299e2f8920 100644
--- a/src/sbbs3/js_bbs.cpp
+++ b/src/sbbs3/js_bbs.cpp
@@ -3611,7 +3611,8 @@ static JSBool js_bbs_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
return(js_SyncResolve(cx, obj, name, js_bbs_properties, js_bbs_functions, NULL, 0));
diff --git a/src/sbbs3/js_client.c b/src/sbbs3/js_client.c
index 81c3761dc788e7e9e159da2513745c9a452894e0..ccdeae9e733c28d443c2d2085a9361b691edd06f 100644
--- a/src/sbbs3/js_client.c
+++ b/src/sbbs3/js_client.c
@@ -137,7 +137,8 @@ static JSBool js_client_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
return(js_SyncResolve(cx, obj, name, js_client_properties, NULL, NULL, 0));
diff --git a/src/sbbs3/js_com.c b/src/sbbs3/js_com.c
index ee80332ceaf950f3ee080ae4f306751777e8ea37..ea3959bafc9f6b3f82f6bc164affec55c1a81346 100644
--- a/src/sbbs3/js_com.c
+++ b/src/sbbs3/js_com.c
@@ -743,7 +743,8 @@ static JSBool js_com_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
return(js_SyncResolve(cx, obj, name, js_com_properties, js_com_functions, NULL, 0));
diff --git a/src/sbbs3/js_conio.c b/src/sbbs3/js_conio.c
index 1ec630ea77498258ef6ebdf5a446639454506d24..405a0892781d4f5f93b18c018c88b2bcd2d25b18 100644
--- a/src/sbbs3/js_conio.c
+++ b/src/sbbs3/js_conio.c
@@ -1113,7 +1113,8 @@ static JSBool js_conio_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
return(js_SyncResolve(cx, obj, name, js_properties, js_functions, NULL, 0));
diff --git a/src/sbbs3/js_console.cpp b/src/sbbs3/js_console.cpp
index dd2066dbea41af7f1622b2202a35fe602c25f657..ea0bd023f232da6088978fb314ce952e15f10a05 100644
--- a/src/sbbs3/js_console.cpp
+++ b/src/sbbs3/js_console.cpp
@@ -1876,7 +1876,8 @@ static JSBool js_console_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
return(js_SyncResolve(cx, obj, name, js_console_properties, js_console_functions, NULL, 0));
diff --git a/src/sbbs3/js_file.c b/src/sbbs3/js_file.c
index 036c8588ca4eaa3f34e1ee7f96c0f5199c7647cd..88f477450854c5ebf2982868717a9d1e90e914f9 100644
--- a/src/sbbs3/js_file.c
+++ b/src/sbbs3/js_file.c
@@ -2394,7 +2394,8 @@ static JSBool js_file_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
return(js_SyncResolve(cx, obj, name, js_file_properties, js_file_functions, NULL, 0));
diff --git a/src/sbbs3/js_global.c b/src/sbbs3/js_global.c
index 5cba50373f842be6057303b59d42da0bc505f6c1..7a5660ffc6c2b3ea2a7f72d01b9d63d349802ee6 100644
--- a/src/sbbs3/js_global.c
+++ b/src/sbbs3/js_global.c
@@ -3830,7 +3830,8 @@ static JSBool js_global_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
if(p->methods) {
diff --git a/src/sbbs3/js_internal.c b/src/sbbs3/js_internal.c
index 564397c5612b706ef448ee4a67ba2aa878a5c1a4..53c70e585843b254e5ba39a4ad2790d8e9700377 100644
--- a/src/sbbs3/js_internal.c
+++ b/src/sbbs3/js_internal.c
@@ -426,7 +426,8 @@ static JSBool js_internal_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
return(js_SyncResolve(cx, obj, name, js_properties, js_functions, NULL, 0));
diff --git a/src/sbbs3/js_msgbase.c b/src/sbbs3/js_msgbase.c
index 00cca42aafb1a565335e299cb8038ee55e733008..c68bd5f2599a01b28e754c04126524f6f45d7e55 100644
--- a/src/sbbs3/js_msgbase.c
+++ b/src/sbbs3/js_msgbase.c
@@ -950,7 +950,8 @@ static JSBool js_get_msg_header_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
/* If we have already enumerated, we're done here... */
@@ -2118,7 +2119,8 @@ static JSBool js_msgbase_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
return(js_SyncResolve(cx, obj, name, js_msgbase_properties, js_msgbase_functions, NULL, 0));
diff --git a/src/sbbs3/js_queue.c b/src/sbbs3/js_queue.c
index d838bcd0b8e81ccdbf19a826618dd730b130a0fb..fb9461c618202eea125fa75692e8d21e86b7f5f9 100644
--- a/src/sbbs3/js_queue.c
+++ b/src/sbbs3/js_queue.c
@@ -379,7 +379,8 @@ static JSBool js_queue_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(jdval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
return(js_SyncResolve(cx, obj, name, js_queue_properties, js_queue_functions, NULL, 0));
diff --git a/src/sbbs3/js_server.c b/src/sbbs3/js_server.c
index 6d913d3ba8d05b35527a37eb378cfb38cd3ec3e0..a677f4ab3456d439c76ad97df146af506fed2eed 100644
--- a/src/sbbs3/js_server.c
+++ b/src/sbbs3/js_server.c
@@ -148,7 +148,8 @@ static JSBool js_server_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
return(js_SyncResolve(cx, obj, name, js_server_properties, NULL, NULL, 0));
diff --git a/src/sbbs3/js_socket.c b/src/sbbs3/js_socket.c
index 3bb4c0accff92a24c2fee399afa03aa8ac5a55f9..e0b97bc314de03b918d102472dfb2ef6c43035e5 100644
--- a/src/sbbs3/js_socket.c
+++ b/src/sbbs3/js_socket.c
@@ -1527,7 +1527,8 @@ static JSBool js_socket_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
return(js_SyncResolve(cx, obj, name, js_socket_properties, js_socket_functions, NULL, 0));
diff --git a/src/sbbs3/js_system.c b/src/sbbs3/js_system.c
index 73bd2d80c950f88d90abff86e61f23d1837d31d8..3d5a108decc7061848902205a76cc0528525f86b 100644
--- a/src/sbbs3/js_system.c
+++ b/src/sbbs3/js_system.c
@@ -698,7 +698,8 @@ static JSBool js_sysstats_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
return(js_SyncResolve(cx, obj, name, js_sysstats_properties, NULL, NULL, 0));
@@ -1920,7 +1921,8 @@ static JSBool js_node_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
return(js_SyncResolve(cx, obj, name, js_node_properties, NULL, NULL, 0));
@@ -1995,7 +1997,8 @@ static JSBool js_system_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
/****************************/
diff --git a/src/sbbs3/js_uifc.c b/src/sbbs3/js_uifc.c
index 7f46787f7ebcb404aa84b533083903fbc54ccb72..735ba2d03397a0e4976070bb2cfcb2e091114635 100644
--- a/src/sbbs3/js_uifc.c
+++ b/src/sbbs3/js_uifc.c
@@ -546,7 +546,8 @@ static JSBool js_uifc_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
return(js_SyncResolve(cx, obj, name, js_properties, js_functions, NULL, 0));
diff --git a/src/sbbs3/js_user.c b/src/sbbs3/js_user.c
index b9bd8b6380d892dfed0924698905b818774ffd7f..568ad5680f3191156b48d9e47d80e05fac17d028 100644
--- a/src/sbbs3/js_user.c
+++ b/src/sbbs3/js_user.c
@@ -1180,7 +1180,8 @@ static JSBool js_user_stats_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
return(js_SyncResolve(cx, obj, name, js_user_stats_properties, NULL, NULL, 0));
@@ -1199,7 +1200,8 @@ static JSBool js_user_security_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
return(js_SyncResolve(cx, obj, name, js_user_security_properties, NULL, NULL, 0));
@@ -1218,7 +1220,8 @@ static JSBool js_user_limits_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
return(js_SyncResolve(cx, obj, name, js_user_limits_properties, NULL, NULL, 0));
@@ -1281,7 +1284,8 @@ static JSBool js_user_resolve(JSContext *cx, JSObject *obj, jsid id)
jsval idval;
JS_IdToValue(cx, id, &idval);
- JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
+ if(JSVAL_IS_STRING(idval))
+ JSSTRING_TO_STRING(cx, JSVAL_TO_STRING(idval), name, NULL);
}
if(name==NULL || strcmp(name, "stats")==0) {
diff --git a/src/sbbs3/jsexec.c b/src/sbbs3/jsexec.c
index d69950313fde4a169a606ac490683b80d99e343c..94f7c0e1681bf66c1646fb221ce4e55e78660456 100644
--- a/src/sbbs3/jsexec.c
+++ b/src/sbbs3/jsexec.c
@@ -899,8 +899,6 @@ long js_exec(const char *fname, char** args)
,path
,diff);
- JS_GC(js_cx);
-
if(js_buf!=NULL)
free(js_buf);