From 7804e10cfeefd2cf59fcfb91da5e1d326bc311d2 Mon Sep 17 00:00:00 2001
From: "brendan%mozilla.org"
 <brendan%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 31 Jan 2002 07:30:05 +0000
Subject: [PATCH] Fix for(i in null) and for(i in undefined) to error per ECMA,
 rather than iterating zero times (121744, r=khanson, sr=shaver).

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

diff --git a/mozilla/js/src/jsinterp.c b/mozilla/js/src/jsinterp.c
index 03d9477d586..0e92d6f76c1 100644
--- a/mozilla/js/src/jsinterp.c
+++ b/mozilla/js/src/jsinterp.c
@@ -1576,9 +1576,11 @@ js_Interpret(JSContext *cx, jsval *result)
 
           case JSOP_TOOBJECT:
             SAVE_SP(fp);
-            ok = js_ValueToObject(cx, FETCH_OPND(-1), &obj);
-            if (!ok)
+            obj = js_ValueToNonNullObject(cx, FETCH_OPND(-1));
+            if (!obj) {
+                ok = JS_FALSE;
                 goto out;
+            }
             STORE_OPND(-1, OBJECT_TO_JSVAL(obj));
             break;