From 047833b19b928ea431c12c25407477f8c855ab27 Mon Sep 17 00:00:00 2001
From: rswindell <>
Date: Tue, 10 Jan 2006 02:18:13 +0000
Subject: [PATCH] Bug-fix in last commit: must use JSVAL_TO_BOOLEAN() to
convert bool to int.
---
src/sbbs3/js_global.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/sbbs3/js_global.c b/src/sbbs3/js_global.c
index 5c4cc7b80a..c35cef8264 100644
--- a/src/sbbs3/js_global.c
+++ b/src/sbbs3/js_global.c
@@ -300,9 +300,10 @@ js_format(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
for(i=1; i<argc; i++) {
if(JSVAL_IS_DOUBLE(argv[i]))
fmt=xp_asprintf_next(fmt,XP_PRINTF_CONVERT|XP_PRINTF_TYPE_DOUBLE,*JSVAL_TO_DOUBLE(argv[i]));
- else if(JSVAL_IS_INT(argv[i])
- || (JSVAL_IS_BOOLEAN(argv[i]) && xp_printf_get_type(fmt)!=XP_PRINTF_TYPE_CHARP))
+ else if(JSVAL_IS_INT(argv[i]))
fmt=xp_asprintf_next(fmt,XP_PRINTF_CONVERT|XP_PRINTF_TYPE_INT,JSVAL_TO_INT(argv[i]));
+ else if(JSVAL_IS_BOOLEAN(argv[i]) && xp_printf_get_type(fmt)!=XP_PRINTF_TYPE_CHARP)
+ fmt=xp_asprintf_next(fmt,XP_PRINTF_CONVERT|XP_PRINTF_TYPE_INT,JSVAL_TO_BOOLEAN(argv[i]));
else {
if((str=JS_ValueToString(cx, argv[i]))==NULL) {
JS_ReportError(cx,"JS_ValueToString failed");
--
GitLab