From 712df10db4d82210b35c731520cb3700f8aa9ca6 Mon Sep 17 00:00:00 2001
From: Blake Kaplan <mrbkap@gmail.com>
Date: Thu, 17 Sep 2009 12:31:42 -0700
Subject: [PATCH] Bug 517250 - Fix a bad assert. r=waldo

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

diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 8d406fbb19c..c5d0ae11f99 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -2363,7 +2363,7 @@ js_TraceStackFrame(JSTracer *trc, JSStackFrame *fp)
                 JS_ASSERT(nslots >= fp->script->nfixed);
             } else {
                 nslots = fp->script->nfixed;
-                JS_ASSERT_IF(!fp->regs->sp, nslots == 0);
+                JS_ASSERT_IF(fp->regs && !fp->regs->sp, nslots == 0);
             }
             TRACE_JSVALS(trc, nslots, fp->slots, "slot");
         }