summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/spdy/spdy_websocket_stream.cc4
-rw-r--r--tools/heapcheck/suppressions.txt6
-rw-r--r--tools/valgrind/memcheck/suppressions.txt6
3 files changed, 2 insertions, 14 deletions
diff --git a/net/spdy/spdy_websocket_stream.cc b/net/spdy/spdy_websocket_stream.cc
index 7ae35c5..fcbb31e 100644
--- a/net/spdy/spdy_websocket_stream.cc
+++ b/net/spdy/spdy_websocket_stream.cc
@@ -71,9 +71,9 @@ int SpdyWebSocketStream::SendData(const char* data, int length) {
NOTREACHED();
return ERR_UNEXPECTED;
}
- IOBuffer* buf(new IOBuffer(length));
+ scoped_refptr<IOBuffer> buf(new IOBuffer(length));
memcpy(buf->data(), data, length);
- return stream_->WriteStreamData(buf, length, spdy::DATA_FLAG_NONE);
+ return stream_->WriteStreamData(buf.get(), length, spdy::DATA_FLAG_NONE);
}
void SpdyWebSocketStream::Close() {
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index 54c7be3..c1adac3ab 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -1608,9 +1608,3 @@
...
fun:content_settings::PrefProviderTest_MigrateSinglePatternSettings_Test::TestBody
}
-{
- bug_87605
- Heapcheck:Leak
- ...
- fun:net::SpdyWebSocketStream::SendData
-}
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index ffcb0b5..98347f6 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -4790,12 +4790,6 @@
fun:_ZN4base8internal8Invoker1ILb0ENS0_15InvokerStorage1IMN12_GLOBAL__N_118TaskClosureAdapterEFvvEPS4_EES6_E8DoInvokeEPNS0_18InvokerStorageBaseE
}
{
- bug_87605
- Memcheck:Leak
- fun:_Znw*
- fun:_ZN3net19SpdyWebSocketStream8SendDataEPKci
-}
-{
bug_87705
Memcheck:Leak
fun:_Znw*