Title: [145960] tags/Safari-537.34/Source/WebCore
- Revision
- 145960
- Author
- lforsch...@apple.com
- Date
- 2013-03-15 16:18:59 -0700 (Fri, 15 Mar 2013)
Log Message
Merged r145958. <rdar://problem/13434350>
Modified Paths
Diff
Modified: tags/Safari-537.34/Source/WebCore/ChangeLog (145959 => 145960)
--- tags/Safari-537.34/Source/WebCore/ChangeLog 2013-03-15 23:14:55 UTC (rev 145959)
+++ tags/Safari-537.34/Source/WebCore/ChangeLog 2013-03-15 23:18:59 UTC (rev 145960)
@@ -1,3 +1,19 @@
+2013-03-15 Lucas Forschler <lforsch...@apple.com>
+
+ Merge r145958
+
+ 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-14 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r145864.
Modified: tags/Safari-537.34/Source/WebCore/platform/cf/SharedBufferCF.cpp (145959 => 145960)
--- tags/Safari-537.34/Source/WebCore/platform/cf/SharedBufferCF.cpp 2013-03-15 23:14:55 UTC (rev 145959)
+++ tags/Safari-537.34/Source/WebCore/platform/cf/SharedBufferCF.cpp 2013-03-15 23:18:59 UTC (rev 145960)
@@ -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
