summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordavidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-10 19:20:01 +0000
committerdavidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-10 19:20:01 +0000
commitf5bf5ba29880002b7240bed7bba73f966295bf72 (patch)
treef747f380d26232e2a51d62ce90075d08d625e30a
parentbda6438c3d043f58b27137ff4b25ba2bafb41425 (diff)
downloadchromium_src-f5bf5ba29880002b7240bed7bba73f966295bf72.zip
chromium_src-f5bf5ba29880002b7240bed7bba73f966295bf72.tar.gz
chromium_src-f5bf5ba29880002b7240bed7bba73f966295bf72.tar.bz2
Fix IOBuffer leak in CertificateResourceHandler and StreamResourceHandler.
As found in https://crbug.com/361440#c9. BUG=none Review URL: https://codereview.chromium.org/232843003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263047 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/loader/certificate_resource_handler.cc4
-rw-r--r--content/browser/loader/stream_resource_handler.cc4
2 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/loader/certificate_resource_handler.cc b/content/browser/loader/certificate_resource_handler.cc
index 4545f34..3c39599 100644
--- a/content/browser/loader/certificate_resource_handler.cc
+++ b/content/browser/loader/certificate_resource_handler.cc
@@ -91,8 +91,8 @@ bool CertificateResourceHandler::OnReadCompleted(int request_id,
// Release the ownership of the buffer, and store a reference
// to it. A new one will be allocated in OnWillRead().
- net::IOBuffer* buffer = NULL;
- read_buffer_.swap(&buffer);
+ scoped_refptr<net::IOBuffer> buffer;
+ read_buffer_.swap(buffer);
// TODO(gauravsh): Should this be handled by a separate thread?
buffer_.push_back(std::make_pair(buffer, bytes_read));
diff --git a/content/browser/loader/stream_resource_handler.cc b/content/browser/loader/stream_resource_handler.cc
index 82fc9c6..5641659 100644
--- a/content/browser/loader/stream_resource_handler.cc
+++ b/content/browser/loader/stream_resource_handler.cc
@@ -88,8 +88,8 @@ bool StreamResourceHandler::OnReadCompleted(int request_id,
// Release the ownership of the buffer, and store a reference
// to it. A new one will be allocated in OnWillRead().
- net::IOBuffer* buffer = NULL;
- read_buffer_.swap(&buffer);
+ scoped_refptr<net::IOBuffer> buffer;
+ read_buffer_.swap(buffer);
stream_->AddData(buffer, bytes_read);
if (!stream_->can_add_data())