Title: [145958] trunk/Source/WebCore
- Revision
- 145958
- Author
- aes...@apple.com
- Date
- 2013-03-15 16:11:20 -0700 (Fri, 15 Mar 2013)
Log Message
REGRESSION (r145820): Stop over-retaining CFDataRefs in SharedBuffer::maybeTransferPlatformData()
https://bugs.webkit.org/show_bug.cgi?id=112474
Reviewed by Simon Fraser.
Transfer ownership of m_cfData to the local variable rather than leaking a reference.
* platform/cf/SharedBufferCF.cpp:
(WebCore::SharedBuffer::maybeTransferPlatformData):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (145957 => 145958)
--- trunk/Source/WebCore/ChangeLog 2013-03-15 23:01:22 UTC (rev 145957)
+++ trunk/Source/WebCore/ChangeLog 2013-03-15 23:11:20 UTC (rev 145958)
@@ -1,3 +1,15 @@
+2013-03-15 Andy Estes <aes...@apple.com>
+
+ REGRESSION (r145820): Stop over-retaining CFDataRefs in SharedBuffer::maybeTransferPlatformData()
+ https://bugs.webkit.org/show_bug.cgi?id=112474
+
+ Reviewed by Simon Fraser.
+
+ Transfer ownership of m_cfData to the local variable rather than leaking a reference.
+
+ * platform/cf/SharedBufferCF.cpp:
+ (WebCore::SharedBuffer::maybeTransferPlatformData):
+
2013-03-15 Rajeev Sarvaria <rsarva...@blackberry.com>
New context extensions restored improperly
Modified: trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp (145957 => 145958)
--- trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2013-03-15 23:01:22 UTC (rev 145957)
+++ trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2013-03-15 23:11:20 UTC (rev 145958)
@@ -83,7 +83,7 @@
// Hang on to the m_cfData pointer in a local pointer as append() will re-enter maybeTransferPlatformData()
// and we need to make sure to early return when it does.
- RetainPtr<CFDataRef> cfData = m_cfData.leakRef();
+ RetainPtr<CFDataRef> cfData(AdoptCF, m_cfData.leakRef());
append(reinterpret_cast<const char*>(CFDataGetBytePtr(cfData.get())), CFDataGetLength(cfData.get()));
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
