summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/websocket_resource.cc
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-04 16:53:07 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-04 16:53:07 +0000
commit8ced4f3f1699fb5f0f9a1a407255f084666123b6 (patch)
tree681a08ac5d960e9ea944be96f11ec2e9f3fd993a /ppapi/proxy/websocket_resource.cc
parente7338783c12381e22253260ffafdd037095ade0d (diff)
downloadchromium_src-8ced4f3f1699fb5f0f9a1a407255f084666123b6.zip
chromium_src-8ced4f3f1699fb5f0f9a1a407255f084666123b6.tar.gz
chromium_src-8ced4f3f1699fb5f0f9a1a407255f084666123b6.tar.bz2
PPAPI: Fix WebSocket Var ref leak receiving binary
BUG=173503 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=180093 Reopened; was reverted here: https://src.chromium.org/viewvc/chrome?view=rev&revision=180105 Tests were failing because the IRT was not rebuilt due to a gyp problem, which was fixed here: https://src.chromium.org/viewvc/chrome?view=rev&revision=180182 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=180190 Reverted again due to 2 tests still failing on Windows 7 and XP: https://src.chromium.org/viewvc/chrome?view=rev&revision=180239 They're failing the new leak check. It's not clear yet if that's a real leak or another build issue; I will investigate separately. This CL still fixes a serious leak on all platforms, so landing without the leak check for now to keep the tests green. Review URL: https://chromiumcodereview.appspot.com/12096099 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180428 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/websocket_resource.cc')
-rw-r--r--ppapi/proxy/websocket_resource.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/ppapi/proxy/websocket_resource.cc b/ppapi/proxy/websocket_resource.cc
index c45de90..7439826 100644
--- a/ppapi/proxy/websocket_resource.cc
+++ b/ppapi/proxy/websocket_resource.cc
@@ -423,10 +423,10 @@ void WebSocketResource::OnPluginMsgReceiveBinaryReply(
return;
// Append received data to queue.
- scoped_refptr<Var> message_var(ArrayBufferVar::FromPPVar(
- PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferPPVar(
+ scoped_refptr<Var> message_var(
+ PpapiGlobals::Get()->GetVarTracker()->MakeArrayBufferVar(
message.size(),
- &message.front())));
+ &message.front()));
received_messages_.push(message_var);
if (!TrackedCallback::IsPending(receive_callback_))