Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(949)

Unified Diff: media/cast/net/udp_transport.cc

Issue 967723002: Cast: Fix crash in udp_transport (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: typ0 Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/net/udp_transport.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/net/udp_transport.cc
diff --git a/media/cast/net/udp_transport.cc b/media/cast/net/udp_transport.cc
index 064a9d90b23c4a8b7c25a38de58fb2c58b2e8e34..0d77a69888148e009a4240e888386399c95e487d 100644
--- a/media/cast/net/udp_transport.cc
+++ b/media/cast/net/udp_transport.cc
@@ -66,6 +66,11 @@ void UdpTransport::StartReceiving(
const PacketReceiverCallbackWithStatus& packet_receiver) {
DCHECK(io_thread_proxy_->RunsTasksOnCurrentThread());
+ if (!udp_socket_) {
+ status_callback_.Run(TRANSPORT_SOCKET_ERROR);
+ return;
+ }
+
packet_receiver_ = packet_receiver;
udp_socket_->SetMulticastLoopbackMode(true);
if (!IsEmpty(local_addr_)) {
@@ -73,6 +78,7 @@ void UdpTransport::StartReceiving(
udp_socket_->AllowAddressReuse() < 0 ||
udp_socket_->Bind(local_addr_) < 0) {
udp_socket_->Close();
+ udp_socket_.reset();
status_callback_.Run(TRANSPORT_SOCKET_ERROR);
LOG(ERROR) << "Failed to bind local address.";
return;
@@ -82,6 +88,7 @@ void UdpTransport::StartReceiving(
udp_socket_->AllowAddressReuse() < 0 ||
udp_socket_->Connect(remote_addr_) < 0) {
udp_socket_->Close();
+ udp_socket_.reset();
status_callback_.Run(TRANSPORT_SOCKET_ERROR);
LOG(ERROR) << "Failed to connect to remote address.";
return;
@@ -111,6 +118,8 @@ void UdpTransport::SetDscp(net::DiffServCodePoint dscp) {
#if defined(OS_WIN)
void UdpTransport::UseNonBlockingIO() {
DCHECK(io_thread_proxy_->RunsTasksOnCurrentThread());
+ if (!udp_socket_)
+ return;
udp_socket_->UseNonBlockingIO();
}
#endif
@@ -131,6 +140,8 @@ void UdpTransport::ReceiveNextPacket(int length_or_status) {
if (packet_receiver_.is_null())
return;
+ if (!udp_socket_)
+ return;
// Loop while UdpSocket is delivering data synchronously. When it responds
// with a "pending" status, break and expect this method to be called back in
@@ -187,6 +198,8 @@ void UdpTransport::ReceiveNextPacket(int length_or_status) {
bool UdpTransport::SendPacket(PacketRef packet, const base::Closure& cb) {
DCHECK(io_thread_proxy_->RunsTasksOnCurrentThread());
+ if (!udp_socket_)
+ return true;
// Increase byte count no matter the packet was sent or dropped.
bytes_sent_ += packet->data.size();
« no previous file with comments | « media/cast/net/udp_transport.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698