From: mstarzinger@chromium.org <mstarzinger@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Wed, 20 Mar 2013 10:13:29 +0000 (+0000)
Subject: Fix handling of context creation failure since r13978.
X-Git-Tag: upstream/4.7.83~14809
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d269364fd6199401d31d710f902809d73343a1ac;p=platform%2Fupstream%2Fv8.git

Fix handling of context creation failure since r13978.

R=jkummerow@chromium.org
TEST=fast/js/concat-large-strings-crash.html

Review URL: https://codereview.chromium.org/12702008

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@13998 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---

diff --git a/src/bootstrapper.cc b/src/bootstrapper.cc
index 58b2ad0..ce58a86 100644
--- a/src/bootstrapper.cc
+++ b/src/bootstrapper.cc
@@ -303,9 +303,9 @@ Handle<Context> Bootstrapper::CreateEnvironment(
     v8::ExtensionConfiguration* extensions) {
   HandleScope scope(isolate_);
   Genesis genesis(isolate_, global_object, global_template, extensions);
-  Handle<Object> context(isolate_->global_handles()->Create(*genesis.result()));
-  Handle<Context> env = Handle<Context>::cast(context);
-  if (!env.is_null()) {
+  if (!genesis.result().is_null()) {
+    Handle<Object> ctx(isolate_->global_handles()->Create(*genesis.result()));
+    Handle<Context> env = Handle<Context>::cast(ctx);
     if (InstallExtensions(env, extensions)) {
       return env;
     }