summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-11 17:37:53 +0000
committeryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-11 17:37:53 +0000
commitdcb0d023e1a71ccbec369b1e02a73c5c3c00dbb1 (patch)
tree092f86092e9d9252c2ea03f2586ec96aaa4e52dc /webkit
parent8485bb64fa8ba1f314c8955ad3821f8431c6fbcb (diff)
downloadchromium_src-dcb0d023e1a71ccbec369b1e02a73c5c3c00dbb1.zip
chromium_src-dcb0d023e1a71ccbec369b1e02a73c5c3c00dbb1.tar.gz
chromium_src-dcb0d023e1a71ccbec369b1e02a73c5c3c00dbb1.tar.bz2
DevTools: fix crash caused by dereferening empty handle
BUG: 31591 Review URL: http://codereview.chromium.org/549007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35911 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/devtools/debugger_agent_impl.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/webkit/glue/devtools/debugger_agent_impl.cc b/webkit/glue/devtools/debugger_agent_impl.cc
index 6a0d848..de80bad 100644
--- a/webkit/glue/devtools/debugger_agent_impl.cc
+++ b/webkit/glue/devtools/debugger_agent_impl.cc
@@ -164,7 +164,11 @@ String DebuggerAgentImpl::ExecuteUtilityFunction(
v8::TryCatch try_catch;
v8::Handle<v8::Value> res_obj = function->Call(context->Global(), 3, args);
if (try_catch.HasCaught()) {
- *exception = WebCore::toWebCoreString(try_catch.Message()->Get());
+ v8::Local<v8::Message> message = try_catch.Message();
+ if (message.IsEmpty())
+ *exception = "Unknown exception";
+ else
+ *exception = WebCore::toWebCoreString(message->Get());
return "";
} else {
return WebCore::toWebCoreStringWithNullCheck(res_obj);