[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

yurys at chromium.org yurys at chromium.org
Wed Dec 22 11:21:33 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 98656b978cbbb2ddf334623ecd679db15a86da9d
Author: yurys at chromium.org <yurys at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 20 15:17:25 2010 +0000

    2010-07-20  Yury Semikhatsky  <yurys at chromium.org>
    
            Reviewed by Pavel Feldman.
    
            [v8] Web Inspector: inspected page renderer crashes when inspected page has JS syntax error
            https://bugs.webkit.org/show_bug.cgi?id=42642
    
            * bindings/v8/V8ConsoleMessage.cpp:
            (WebCore::V8ConsoleMessage::handler):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63746 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 671235a..2399d33 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-07-20  Yury Semikhatsky  <yurys at chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        [v8] Web Inspector: inspected page renderer crashes when inspected page has JS syntax error
+        https://bugs.webkit.org/show_bug.cgi?id=42642
+
+        * bindings/v8/V8ConsoleMessage.cpp:
+        (WebCore::V8ConsoleMessage::handler):
+
 2010-07-20  Sheriff Bot  <webkit.review.bot at gmail.com>
 
         Unreviewed, rolling out r63742.
diff --git a/WebCore/bindings/v8/V8ConsoleMessage.cpp b/WebCore/bindings/v8/V8ConsoleMessage.cpp
index f5e6300..8b6bb17 100644
--- a/WebCore/bindings/v8/V8ConsoleMessage.cpp
+++ b/WebCore/bindings/v8/V8ConsoleMessage.cpp
@@ -115,7 +115,7 @@ void V8ConsoleMessage::handler(v8::Handle<v8::Message> message, v8::Handle<v8::V
     v8::Handle<v8::StackTrace> stackTrace = message->GetStackTrace();
     OwnPtr<ScriptCallStack> callStack;
     // Currently stack trace is only collected when inspector is open.
-    if (!stackTrace.IsEmpty()) {
+    if (!stackTrace.IsEmpty() && stackTrace->GetFrameCount() > 0) {
         v8::Local<v8::Context> context = v8::Context::GetEntered();
         ScriptState* scriptState = ScriptState::forContext(context);
         callStack = ScriptCallStack::create(scriptState, stackTrace);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list