summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorrnk@chromium.org <rnk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-07 14:20:00 +0000
committerrnk@chromium.org <rnk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-07 14:20:00 +0000
commitdf0688c521ed848198015fee85558d9632a3d020 (patch)
tree8528fdcda96695193245430052526c910b8d3568 /net
parent1e2f3e41509a4b2ff696b083b1afda24ca5232e4 (diff)
downloadchromium_src-df0688c521ed848198015fee85558d9632a3d020.zip
chromium_src-df0688c521ed848198015fee85558d9632a3d020.tar.gz
chromium_src-df0688c521ed848198015fee85558d9632a3d020.tar.bz2
Fix ref leak in WebSocketServerSocketImpl introduced in r115422.
Also remove the heapcheck and memcheck suppressions. Added cbentzel and timurrrr for OWNERS approval. R=jhawkins@chromium.org,cbentzel@chromium.org,timurrrr@chromium.org BUG=108399 TEST=ran WebSocketServerSocketTest.* under drmemory Review URL: https://chromiumcodereview.appspot.com/9309090 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120775 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/socket/web_socket_server_socket.cc4
1 files changed, 2 insertions, 2 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_; }