Bug 1472681: Fix NULL_DEREFERENCE error in js/src/vm/EnvironmentObject-inl.h. r?luke draft
authorRobert Bartlensky <rbartlensky@mozilla.com>
Thu, 19 Jul 2018 11:16:42 +0100
changeset 820271 686b7f1561be12038a6b02bda7fdad993726f08d
parent 820131 5a8107262015714d2907a85abc24c847ad9b32d2
push id116775
push userbmo:rbartlensky@mozilla.com
push dateThu, 19 Jul 2018 10:17:51 +0000
reviewersluke
bugs1472681
milestone63.0a1
Bug 1472681: Fix NULL_DEREFERENCE error in js/src/vm/EnvironmentObject-inl.h. r?luke MozReview-Commit-ID: 9p8jbWeZvhg
js/src/vm/EnvironmentObject-inl.h
--- a/js/src/vm/EnvironmentObject-inl.h
+++ b/js/src/vm/EnvironmentObject-inl.h
@@ -12,18 +12,21 @@
 #include "vm/JSObject-inl.h"
 #include "vm/TypeInference-inl.h"
 
 namespace js {
 
 inline LexicalEnvironmentObject&
 NearestEnclosingExtensibleLexicalEnvironment(JSObject* env)
 {
-    while (!IsExtensibleLexicalEnvironment(env))
+    MOZ_ASSERT(env);
+    while (!IsExtensibleLexicalEnvironment(env)) {
         env = env->enclosingEnvironment();
+        MOZ_ASSERT(env);
+    }
     return env->as<LexicalEnvironmentObject>();
 }
 
 inline void
 EnvironmentObject::setAliasedBinding(JSContext* cx, uint32_t slot, PropertyName* name,
                                      const Value& v)
 {
     if (isSingleton()) {