diff options
| -rw-r--r-- | chrome/browser/extensions/api/socket/socket_api_controller.cc | 6 | ||||
| -rw-r--r-- | tools/heapcheck/suppressions.txt | 14 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 8 |
3 files changed, 25 insertions, 3 deletions
diff --git a/chrome/browser/extensions/api/socket/socket_api_controller.cc b/chrome/browser/extensions/api/socket/socket_api_controller.cc index 30890b8..2195297 100644 --- a/chrome/browser/extensions/api/socket/socket_api_controller.cc +++ b/chrome/browser/extensions/api/socket/socket_api_controller.cc @@ -22,8 +22,8 @@ namespace extensions { // we need to manage it in the context of an extension. class Socket { public: - Socket(const Profile* profile, const std::string& src_extension_id, - const GURL& src_url); + explicit Socket(const Profile* profile, const std::string& src_extension_id, + const GURL& src_url); ~Socket(); bool Connect(const net::IPEndPoint& ip_end_point); @@ -38,7 +38,7 @@ class Socket { std::string src_extension_id_; GURL src_url_; - scoped_ptr<net::UDPClientSocket> udp_client_socket_; + net::UDPClientSocket* udp_client_socket_; bool is_connected_; net::OldCompletionCallbackImpl<Socket> io_callback_; diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt index fa90381..9549986 100644 --- a/tools/heapcheck/suppressions.txt +++ b/tools/heapcheck/suppressions.txt @@ -1785,3 +1785,17 @@ fun:AccessibilityEventRouterViewsTest::CreateWindowWithContents fun:AccessibilityEventRouterViewsTest_TestFocusNotification_Test::TestBody } +{ + bug_106529_a + Heapcheck:Leak + ... + fun:extensions::SocketController::ConnectUdp + fun:extensions::SocketApiControllerTest_TestSocketControllerLifetime_Test::TestBody +} +{ + bug_106529_b + Heapcheck:Leak + ... + fun:extensions::SocketController::CreateUdp + fun:extensions::SocketApiControllerTest_TestSocketControllerLifetime_Test::TestBody +} diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index 65f3cf4..92cf61e 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -5369,6 +5369,14 @@ fun:_ZN5ppapi5proxy20PPB_Graphics2D_Proxy14OnHostMsgFlushERKNS_12HostResourceE } { + bug_106529 + Memcheck:Leak + fun:_Znw* + fun:_ZN10extensions6SocketC?EPK7ProfileRKSsRK4GURL + fun:_ZN10extensions16SocketController9CreateUdpEPK7ProfileRKSsRK4GURL + fun:_ZN10extensions57SocketApiControllerTest_TestSocketControllerLifetime_Test8TestBodyEv +} +{ bug_106549 Memcheck:Uninitialized fun:_ZN16ExtensionService24ProcessExtensionSyncDataERK17ExtensionSyncDataRNS_10SyncBundleE |