diff options
| -rw-r--r-- | net/socket/web_socket_server_socket.cc | 4 | ||||
| -rw-r--r-- | tools/heapcheck/suppressions.txt | 8 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 9 |
3 files changed, 2 insertions, 19 deletions
diff --git a/net/socket/web_socket_server_socket.cc b/net/socket/web_socket_server_socket.cc index add4a55..c316415 100644 --- a/net/socket/web_socket_server_socket.cc +++ b/net/socket/web_socket_server_socket.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -726,7 +726,7 @@ class WebSocketServerSocketImpl : public net::WebSocketServerSocket { } operator net::DrainableIOBuffer*() { - return new net::DrainableIOBuffer(io_buf_.release(), bytes_written_); + return new net::DrainableIOBuffer(io_buf_.get(), bytes_written_); } bool is_ok() { return is_ok_; } diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt index d20ba2f..68f6704 100644 --- a/tools/heapcheck/suppressions.txt +++ b/tools/heapcheck/suppressions.txt @@ -1771,14 +1771,6 @@ fun:BrowserThemePackTest_CanBuildAndReadPack_Test::TestBody } { - bug_108399 - Heapcheck:Leak - ... - fun:*Buffer - fun:::WebSocketServerSocketImpl::ProcessHandshake - fun:::WebSocketServerSocketImpl::OnRead -} -{ bug_109613 Heapcheck:Leak fun:AutofillProfileSyncableServiceTest::SetUp diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index bfc4308..9826d6fb3 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -5177,15 +5177,6 @@ fun:_ZN45BrowserThemePackTest_CanBuildAndReadPack_Test8TestBodyEv } { - bug_108399 - Memcheck:Leak - fun:_Znw* - ... - fun:*WebSocketServerSocketImpl16ProcessHandshakeEvEN6Buffer* - fun:*WebSocketServerSocketImpl16ProcessHandshakeEv - fun:*WebSocketServerSocketImpl6OnReadEi -} -{ bug_108531 Memcheck:Leak fun:_Znw* |