From c76f1731b053268bd423a60988dfacd349c5c8ba Mon Sep 17 00:00:00 2001
From: "mrbkap%gmail.com"
 <mrbkap%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 28 Feb 2007 04:04:15 +0000
Subject: [PATCH] Only warn for properties that we find on our object, not on
 properties that we're overriding. bug 365869 and 371174, r=crowder

git-svn-id: svn://10.0.0.236/trunk@221061 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/js/src/jsinterp.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/mozilla/js/src/jsinterp.c b/mozilla/js/src/jsinterp.c
index daba7e5cd69..7e5d0fe83cf 100644
--- a/mozilla/js/src/jsinterp.c
+++ b/mozilla/js/src/jsinterp.c
@@ -1773,6 +1773,9 @@ js_CheckRedeclaration(JSContext *cx, JSObject *obj, jsid id, uintN attrs,
     }
 
     if (attrs == JSPROP_INITIALIZER) {
+        /* Allow the new object to override properties. */
+        if (obj2 != obj)
+            return JS_TRUE;
         report = JSREPORT_WARNING | JSREPORT_STRICT;
     } else {
         /* We allow redeclaring some non-readonly properties. */