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

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

Issue 1417873007: Resolve media/cast crypto crash, and add crash reporting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
Index: media/cast/net/cast_transport_sender_impl.cc
diff --git a/media/cast/net/cast_transport_sender_impl.cc b/media/cast/net/cast_transport_sender_impl.cc
index c3afc276b335c030f2140a68ea0be9857e418afe..9a763de21c3772738f4ed0d3346212279908d409 100644
--- a/media/cast/net/cast_transport_sender_impl.cc
+++ b/media/cast/net/cast_transport_sender_impl.cc
@@ -242,7 +242,9 @@ namespace {
void EncryptAndSendFrame(const EncodedFrame& frame,
TransportEncryptionHandler* encryptor,
RtpSender* sender) {
- if (encryptor->is_activated()) {
+ // TODO(miu): We probably shouldn't attempt to send an empty frame, but this
+ // issue is still under investigation. http://crbug.com/519022
+ if (encryptor->is_activated() && !frame.data.empty()) {
EncodedFrame encrypted_frame;
frame.CopyMetadataTo(&encrypted_frame);
if (encryptor->Encrypt(frame.frame_id, frame.data, &encrypted_frame.data)) {

Powered by Google App Engine
This is Rietveld 408576698