[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e
weinig at apple.com
weinig at apple.com
Fri Jan 21 14:38:42 UTC 2011
The following commit has been merged in the debian/experimental branch:
commit 55b6749edf5cb0569e91a69205a026db758ebfd3
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 23 20:58:47 2010 +0000
<rdar://problem/8799032>
REGRESSION(r74436) Crash opening many pages with WebKit2
Reviewed by Anders Carlsson.
* Shared/cf/ArgumentCodersCF.cpp:
(CoreIPC::decode):
Fix paste-o. Decode into a CFDataRef not a CFDictionaryRef
when decoding CFDataRefs.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74575 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ec159cc..4a6e6ec 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-23 Sam Weinig <sam at webkit.org>
+
+ Reviewed by Anders Carlsson.
+
+ <rdar://problem/8799032>
+ REGRESSION(r74436) Crash opening many pages with WebKit2
+
+ * Shared/cf/ArgumentCodersCF.cpp:
+ (CoreIPC::decode):
+ Fix paste-o. Decode into a CFDataRef not a CFDictionaryRef
+ when decoding CFDataRefs.
+
2010-12-22 Sam Weinig <sam at webkit.org>
Reviewed by Darin Adler.
diff --git a/WebKit2/Shared/cf/ArgumentCodersCF.cpp b/WebKit2/Shared/cf/ArgumentCodersCF.cpp
index f977c84..2d4e339 100644
--- a/WebKit2/Shared/cf/ArgumentCodersCF.cpp
+++ b/WebKit2/Shared/cf/ArgumentCodersCF.cpp
@@ -140,7 +140,7 @@ static bool decode(ArgumentDecoder* decoder, RetainPtr<CFTypeRef>& result)
return true;
}
case CFData: {
- RetainPtr<CFDictionaryRef> data;
+ RetainPtr<CFDataRef> data;
if (!decode(decoder, data))
return false;
result.adoptCF(data.leakRef());
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list