summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
authorelijahtaylor <elijahtaylor@chromium.org>2015-01-28 12:11:40 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-28 20:12:32 +0000
commit89f28c88b7c9fe13c9b723b19c5c9dd189521d81 (patch)
tree728d62f01226d6932990fce037e05267bb47baa4 /ppapi
parent9daca04872a5142b422ab85e7c9332c1ef934f9b (diff)
downloadchromium_src-89f28c88b7c9fe13c9b723b19c5c9dd189521d81.zip
chromium_src-89f28c88b7c9fe13c9b723b19c5c9dd189521d81.tar.gz
chromium_src-89f28c88b7c9fe13c9b723b19c5c9dd189521d81.tar.bz2
Fix callback access in Pepper's UDP socket resource
BUG=452249 Review URL: https://codereview.chromium.org/881203002 Cr-Commit-Position: refs/heads/master@{#313568}
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/proxy/udp_socket_resource_base.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/ppapi/proxy/udp_socket_resource_base.cc b/ppapi/proxy/udp_socket_resource_base.cc
index b5c977c..97864d5 100644
--- a/ppapi/proxy/udp_socket_resource_base.cc
+++ b/ppapi/proxy/udp_socket_resource_base.cc
@@ -320,6 +320,11 @@ void UDPSocketResourceBase::OnPluginMsgPushRecvResult(
void UDPSocketResourceBase::OnPluginMsgSendToReply(
const ResourceMessageReplyParams& params,
int32_t bytes_written) {
+ // This can be empty if the socket was closed, but there are still tasks
+ // to be posted for this resource.
+ if (sendto_callbacks_.empty())
+ return;
+
scoped_refptr<TrackedCallback> callback = sendto_callbacks_.front();
sendto_callbacks_.pop();
if (!TrackedCallback::IsPending(callback))