From 256dffda4653bdf78f1be7f5fe8fd74530eb18a4 Mon Sep 17 00:00:00 2001
From: Brendan Eich <brendan@mozilla.org>
Date: Wed, 25 Nov 2009 13:49:15 -0800
Subject: [PATCH] Tolerate race condition or broken resolve hook (530507,
 r=jorendorff).

---
 js/src/jsobj.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/jsobj.cpp b/js/src/jsobj.cpp
index c8ac745f8479..f713010aa865 100644
--- a/js/src/jsobj.cpp
+++ b/js/src/jsobj.cpp
@@ -4759,7 +4759,7 @@ js_SetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, uintN defineHow,
             }
         }
 
-        sprop = scope->addProperty(cx, id, getter, setter, SPROP_INVALID_SLOT,
+        sprop = scope->putProperty(cx, id, getter, setter, SPROP_INVALID_SLOT,
                                    attrs, flags, shortid);
         if (!sprop) {
             JS_UNLOCK_SCOPE(cx, scope);