[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
andersca at apple.com
andersca at apple.com
Wed Dec 22 11:25:15 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit eb01545b5c971527289ba161e2ec513bd68160a9
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 22 21:58:17 2010 +0000
Don't assert when Connection::invalidate is called before Connection::dispatchConnectionDidClose
https://bugs.webkit.org/show_bug.cgi?id=42851
Reviewed by Sam Weinig.
* Platform/CoreIPC/Connection.cpp:
(CoreIPC::Connection::dispatchConnectionDidClose):
Just return early if m_client is 0.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63916 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 98834e1..0abb0ac 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-07-22 Anders Carlsson <andersca at apple.com>
+
+ Reviewed by Sam Weinig.
+
+ Don't assert when Connection::invalidate is called before Connection::dispatchConnectionDidClose
+ https://bugs.webkit.org/show_bug.cgi?id=42851
+
+ * Platform/CoreIPC/Connection.cpp:
+ (CoreIPC::Connection::dispatchConnectionDidClose):
+ Just return early if m_client is 0.
+
2010-07-22 Adam Roben <aroben at apple.com>
Use ::MessageBox instead of ::DebugBreak to make the web process wait
diff --git a/WebKit2/Platform/CoreIPC/Connection.cpp b/WebKit2/Platform/CoreIPC/Connection.cpp
index 35e4e3f..028376f 100644
--- a/WebKit2/Platform/CoreIPC/Connection.cpp
+++ b/WebKit2/Platform/CoreIPC/Connection.cpp
@@ -196,6 +196,11 @@ void Connection::connectionDidClose()
void Connection::dispatchConnectionDidClose()
{
+ // If the connection has been explicitly invalidated before dispatchConnectionDidClose was called,
+ // then the client will be null here.
+ if (!m_client)
+ return;
+
m_client->didClose(this);
// Reset the client.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list