From d5ccd1e1918b2ab0d94300cf3ca85669fda8d8f2 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Sun, 9 Oct 2011 06:30:15 +0000
Subject: [PATCH] Fix resolve functions in CPP
---
src/sbbs3/file.cpp | 2 +-
src/sbbs3/js_bbs.cpp | 10 +++++++---
src/sbbs3/js_console.cpp | 10 +++++++---
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/sbbs3/file.cpp b/src/sbbs3/file.cpp
index 9d463abe60..165692aa52 100644
--- a/src/sbbs3/file.cpp
+++ b/src/sbbs3/file.cpp
@@ -281,7 +281,7 @@ bool sbbs_t::checkfname(char *fname)
if(fname[0]=='-'
|| strcspn(fname,ILLEGAL_FILENAME_CHARS)!=strlen(fname)) {
lprintf(LOG_WARNING,"Suspicious filename attempt: '%s'",fname);
- hacklog("Filename", fname);
+ hacklog((char *)"Filename", fname);
return(false);
}
if(strstr(fname,".."))
diff --git a/src/sbbs3/js_bbs.cpp b/src/sbbs3/js_bbs.cpp
index 75275ef0d3..1ce7d47744 100644
--- a/src/sbbs3/js_bbs.cpp
+++ b/src/sbbs3/js_bbs.cpp
@@ -3481,15 +3481,19 @@ static JSBool js_bbs_resolve(JSContext *cx, JSObject *obj, jsid id)
{
char* name=NULL;
- if(id != JSVAL_NULL)
- name=JS_GetStringBytes(JSVAL_TO_STRING(id));
+ if(id != JSID_VOID && id != JSID_EMPTY) {
+ jsval idval;
+
+ JS_IdToValue(cx, id, &idval);
+ name=JS_GetStringBytes(JSVAL_TO_STRING(idval));
+ }
return(js_SyncResolve(cx, obj, name, js_bbs_properties, js_bbs_functions, NULL, 0));
}
static JSBool js_bbs_enumerate(JSContext *cx, JSObject *obj)
{
- return(js_bbs_resolve(cx, obj, JSVAL_NULL));
+ return(js_bbs_resolve(cx, obj, JSID_VOID));
}
static JSClass js_bbs_class = {
diff --git a/src/sbbs3/js_console.cpp b/src/sbbs3/js_console.cpp
index 1ebba2f9c8..43ab34d067 100644
--- a/src/sbbs3/js_console.cpp
+++ b/src/sbbs3/js_console.cpp
@@ -1762,15 +1762,19 @@ static JSBool js_console_resolve(JSContext *cx, JSObject *obj, jsid id)
{
char* name=NULL;
- if(id != JSVAL_NULL)
- name=JS_GetStringBytes(JSVAL_TO_STRING(id));
+ if(id != JSID_VOID && id != JSID_EMPTY) {
+ jsval idval;
+
+ JS_IdToValue(cx, id, &idval);
+ name=JS_GetStringBytes(JSVAL_TO_STRING(idval));
+ }
return(js_SyncResolve(cx, obj, name, js_console_properties, js_console_functions, NULL, 0));
}
static JSBool js_console_enumerate(JSContext *cx, JSObject *obj)
{
- return(js_console_resolve(cx, obj, JSVAL_NULL));
+ return(js_console_resolve(cx, obj, JSID_VOID));
}
static JSClass js_console_class = {
--
GitLab