From 8ea7f202b1e2813780b0784d8d4262381ed6ffcd Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Sun, 18 Dec 2005 22:17:48 +0100 Subject: [PATCH 1/2] #include "src/scripting/smjs/cache_object.h" --- src/scripting/smjs/cache_object.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scripting/smjs/cache_object.c b/src/scripting/smjs/cache_object.c index 76d00a569..f065af485 100644 --- a/src/scripting/smjs/cache_object.c +++ b/src/scripting/smjs/cache_object.c @@ -8,6 +8,7 @@ #include "cache/cache.h" #include "ecmascript/spidermonkey/util.h" +#include "scripting/smjs/cache_object.h" #include "scripting/smjs/core.h" #include "util/error.h" #include "util/memory.h" From 2fef4bd5315293d32da3f39c12052bfa38319ab3 Mon Sep 17 00:00:00 2001 From: Miciah Dashiel Butler Masters Date: Sun, 18 Dec 2005 22:47:58 +0000 Subject: [PATCH 2/2] In cache_entry_get_property and cache_entry_set_property, use cache_entry_is_valid to check that the reference to the struct cache_entry is still valid. Thanks to fonseca for the reminder. --- src/scripting/smjs/cache_object.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripting/smjs/cache_object.c b/src/scripting/smjs/cache_object.c index f065af485..15dd78200 100644 --- a/src/scripting/smjs/cache_object.c +++ b/src/scripting/smjs/cache_object.c @@ -32,7 +32,7 @@ cache_entry_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) { struct cache_entry *cached = JS_GetPrivate(ctx, obj); - if (!cached) return JS_FALSE; + if (!cache_entry_is_valid(cached)) return JS_FALSE; undef_to_jsval(ctx, vp); @@ -78,7 +78,7 @@ cache_entry_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) { struct cache_entry *cached = JS_GetPrivate(ctx, obj); - if (!cached) return JS_FALSE; + if (!cache_entry_is_valid(cached)) return JS_FALSE; if (!JSVAL_IS_INT(id)) return JS_FALSE;