Harden Runtime_FunctionSetPrototype, Isolate::PrintStack

src/frames.cc

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "v8.h"
 
 #include "ast.h"
 #include "deoptimizer.h"
 #include "frames-inl.h"
 #include "full-codegen.h"
@@ skipping 1217 matching lines @@
       accumulator->Add("// no expression found - inconsistent frame?");
     }
     accumulator->Add("\n");
   }
 
   // Try to get hold of the context of this frame.
   Context* context = NULL;
   if (this->context() != NULL && this->context()->IsContext()) {
     context = Context::cast(this->context());
   }
+  while (context->IsWithContext()) {
+    context = context->previous();
+    ASSERT(context != NULL);
+  }
 
   // Print heap-allocated local variables.
   if (heap_locals_count > 0) {
     accumulator->Add("  // heap-allocated locals\n");
   }
   for (int i = 0; i < heap_locals_count; i++) {
     accumulator->Add("  var ");
     accumulator->PrintName(scope_info->ContextLocalName(i));
     accumulator->Add(" = ");
     if (context != NULL) {
-      if (i < context->length()) {
-        accumulator->Add("%o", context->get(Context::MIN_CONTEXT_SLOTS + i));
+      int index = Context::MIN_CONTEXT_SLOTS + i;
+      if (index < context->length()) {
+        accumulator->Add("%o", context->get(index));
       } else {
         accumulator->Add(
             "// warning: missing context slot - inconsistent frame?");
       }
     } else {
       accumulator->Add("// warning: no context found - inconsistent frame?");
     }
     accumulator->Add("\n");
   }
 
@@ skipping 356 matching lines @@
   ZoneList<StackFrame*> list(10, zone);
   for (StackFrameIterator it(isolate); !it.done(); it.Advance()) {
     StackFrame* frame = AllocateFrameCopy(it.frame(), zone);
     list.Add(frame, zone);
   }
   return list.ToVector();
 }
 
 
 } }  // namespace v8::internal