From a3918d8c301241bc110a23c894b058268a6df8c8 Mon Sep 17 00:00:00 2001 From: Miciah Dashiel Butler Masters Date: Sun, 13 Nov 2011 04:06:42 +0000 Subject: [PATCH] cache_entry_get_property: fix assertion failure In cache_entry_get_property, don't assert the return value from get_cache_fragment; instead, just return JS_FALSE if the value is NULL. --- src/scripting/smjs/cache_object.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/scripting/smjs/cache_object.c b/src/scripting/smjs/cache_object.c index 0bdb5635..8b69ae99 100644 --- a/src/scripting/smjs/cache_object.c +++ b/src/scripting/smjs/cache_object.c @@ -72,7 +72,10 @@ cache_entry_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp) case CACHE_ENTRY_CONTENT: { struct fragment *fragment = get_cache_fragment(cached); - assert(fragment); + if (!fragment) { + ret = JS_FALSE; + break; + } *vp = STRING_TO_JSVAL(JS_NewStringCopyN(smjs_ctx, fragment->data,