diff --git a/src/sbbs3/js_filebase.c b/src/sbbs3/js_filebase.c index 2ff9ff5fb242744730c232ec014c2c9e31a23a50..2cd39ff27c04876a7be80d32f5883448a78d74b5 100644 --- a/src/sbbs3/js_filebase.c +++ b/src/sbbs3/js_filebase.c @@ -180,7 +180,7 @@ set_file_properties(JSContext *cx, JSObject* obj, file_t* f, enum file_detail de || !JS_DefineProperty(cx, obj, "name", STRING_TO_JSVAL(js_str), NULL, NULL, flags)) return false; - if(f->from != NULL || detail > file_detail_extdesc + if((f->from != NULL || detail > file_detail_extdesc) && ((js_str = JS_NewStringCopyZ(cx, f->from)) == NULL || !JS_DefineProperty(cx, obj, "from", STRING_TO_JSVAL(js_str), NULL, NULL, flags))) return false; @@ -190,17 +190,17 @@ set_file_properties(JSContext *cx, JSObject* obj, file_t* f, enum file_detail de && !JS_DefineProperty(cx, obj, "anon", val, NULL, NULL, flags)) return false; - if(f->tags != NULL || detail > file_detail_extdesc + if((f->tags != NULL || detail > file_detail_extdesc) && ((js_str = JS_NewStringCopyZ(cx, f->tags)) == NULL || !JS_DefineProperty(cx, obj, "tags", STRING_TO_JSVAL(js_str), NULL, NULL, flags))) return false; - if(f->desc != NULL || detail > file_detail_extdesc + if((f->desc != NULL || detail > file_detail_extdesc) && ((js_str = JS_NewStringCopyZ(cx, f->desc)) == NULL || !JS_DefineProperty(cx, obj, "desc", STRING_TO_JSVAL(js_str), NULL, NULL, flags))) return false; - if((f->extdesc != NULL && *f->extdesc != '\0') || detail > file_detail_extdesc + if(((f->extdesc != NULL && *f->extdesc != '\0') || detail > file_detail_extdesc) && ((js_str = JS_NewStringCopyZ(cx, f->extdesc)) == NULL || !JS_DefineProperty(cx, obj, "extdesc", STRING_TO_JSVAL(js_str), NULL, NULL, flags))) return false;