commit 7dbb701076f33e459cd3bc89a49bfec43b359545
author Anders Carlsson <andersc@webrtc.org> Mon Mar 05 09:26:03 2018
committer Commit Bot <commit-bot@chromium.org> Wed Mar 07 09:57:16 2018
tree 9bb778189eac9d9c3da78ecc495421a60f649ab1
parent 69d2dc94d3d04dcebe575260cfb494f0c8b690cd

Fix crash when setting duplicate receive codecs.

Instead of crashing, log a warning.

Bug: chromium:810173
Change-Id: I7e43889fdab429fcb231657f5770b0ff26f34a8f
Reviewed-on: https://webrtc-review.googlesource.com/59020
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Anders Carlsson <andersc@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22322}

media/engine/webrtcvideoengine.cc

diff --git a/media/engine/webrtcvideoengine.cc b/media/engine/webrtcvideoengine.cc
index 8491699..d0516ee 100644
--- a/media/engine/webrtcvideoengine.cc
+++ b/media/engine/webrtcvideoengine.cc
@@ -2211,6 +2211,13 @@
                                         recv_codec.codec.params);
     std::unique_ptr<webrtc::VideoDecoder> new_decoder;
 
+    if (allocated_decoders_.count(video_format) > 0) {
+      RTC_LOG(LS_WARNING)
+          << "VideoReceiveStream configured with duplicate codecs: "
+          << video_format.name;
+      continue;
+    }
+
     auto it = old_decoders->find(video_format);
     if (it != old_decoders->end()) {
       new_decoder = std::move(it->second);