From a869e7d22760d5e8b7e82272e3db05c947758216 Mon Sep 17 00:00:00 2001
From: David Anderson <danderson@mozilla.com>
Date: Sat, 8 Jan 2011 15:28:31 -0800
Subject: [PATCH] Use the right shape when watching objects (bug 624050,
 r=jimb).

---
 js/src/jsdbgapi.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/js/src/jsdbgapi.cpp b/js/src/jsdbgapi.cpp
index a0ec36aeb1f3..14aa5438bf70 100644
--- a/js/src/jsdbgapi.cpp
+++ b/js/src/jsdbgapi.cpp
@@ -725,6 +725,9 @@ js_watch_set(JSContext *cx, JSObject *obj, jsid id, Value *vp)
                 return JS_FALSE;
             }
 
+            /* Handler could have redefined the shape; see bug 624050. */
+            shape = wp->shape;
+
             /*
              * Pass the output of the handler to the setter. Security wrappers
              * prevent any funny business between watchpoints and setters.