Title: [197676] releases/WebKitGTK/webkit-2.12/Source/WebKit2
- Revision
- 197676
- Author
- [email protected]
- Date
- 2016-03-07 03:34:42 -0800 (Mon, 07 Mar 2016)
Log Message
Merge r197402 - NetworkCache: Web process leaks resource buffer when using shareable reasources
https://bugs.webkit.org/show_bug.cgi?id=154852
Reviewed by Darin Adler.
ResourceLoader::didReceiveBuffer() expects a PassRefPtr, but we
are passing a raw pointer making PassRefPtr to take another
reference instead of transfering the ownership as expected.
* WebProcess/Network/WebResourceLoader.cpp:
(WebKit::WebResourceLoader::didReceiveResource):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog (197675 => 197676)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-03-07 11:31:42 UTC (rev 197675)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-03-07 11:34:42 UTC (rev 197676)
@@ -1,3 +1,17 @@
+2016-03-01 Carlos Garcia Campos <[email protected]>
+
+ NetworkCache: Web process leaks resource buffer when using shareable reasources
+ https://bugs.webkit.org/show_bug.cgi?id=154852
+
+ Reviewed by Darin Adler.
+
+ ResourceLoader::didReceiveBuffer() expects a PassRefPtr, but we
+ are passing a raw pointer making PassRefPtr to take another
+ reference instead of transfering the ownership as expected.
+
+ * WebProcess/Network/WebResourceLoader.cpp:
+ (WebKit::WebResourceLoader::didReceiveResource):
+
2016-02-29 Brady Eidson <[email protected]>
Modern IDB: WebKit 2 IPC layer easily confused about multiple web processes being connected.
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (197675 => 197676)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-03-07 11:31:42 UTC (rev 197675)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-03-07 11:34:42 UTC (rev 197676)
@@ -194,8 +194,8 @@
Ref<WebResourceLoader> protect(*this);
// Only send data to the didReceiveData callback if it exists.
- if (buffer->size())
- m_coreLoader->didReceiveBuffer(buffer.get(), buffer->size(), DataPayloadWholeResource);
+ if (unsigned bufferSize = buffer->size())
+ m_coreLoader->didReceiveBuffer(buffer.release(), bufferSize, DataPayloadWholeResource);
if (!m_coreLoader)
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
