From 72c34eac9ff75b03e5b19d368c2c4566ecfb5ebb Mon Sep 17 00:00:00 2001 From: rswindell <> Date: Sat, 4 Aug 2001 01:33:18 +0000 Subject: [PATCH] Initialize arglist to NULLs in js_format(), eliminates GPFs if incorrect number of args for fmt. --- src/sbbs3/js_global.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/sbbs3/js_global.c b/src/sbbs3/js_global.c index e845c8ea43..129b582cbb 100644 --- a/src/sbbs3/js_global.c +++ b/src/sbbs3/js_global.c @@ -85,14 +85,14 @@ js_format(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) JSString * str; va_list arglist[64]; - fmt = JS_ValueToString(cx, argv[0]); - if (!fmt) + if((fmt=JS_ValueToString(cx, argv[0]))==NULL) return(JS_FALSE); + memset(arglist,0,sizeof(arglist)); /* Initialize arglist to NULLs */ + for (i = 1; i < argc && i<sizeof(arglist)/sizeof(arglist[0]); i++) { if(JSVAL_IS_STRING(argv[i])) { - str = JS_ValueToString(cx, argv[i]); - if (!str) + if((str=JS_ValueToString(cx, argv[i]))==NULL) return(JS_FALSE); arglist[i-1]=JS_GetStringBytes(str); } else if(JSVAL_IS_INT(argv[i]) || JSVAL_IS_BOOLEAN(argv[i])) -- GitLab