From 12a39f4100f19c56052b134403c9969b0fdfd5b2 Mon Sep 17 00:00:00 2001
From: stefan <stefan@webrtc.org>
Date: Wed, 12 Oct 2016 15:30:14 -0700
Subject: [PATCH] Don't crash on unexpected stap-a or fu-a.

BUG=chromium:655091

Review-Url: https://codereview.webrtc.org/2406363004
Cr-Commit-Position: refs/heads/master@{#14618}
---
 webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc
index 81dcb8b9e2..2747945831 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_format_h264.cc
@@ -529,7 +529,8 @@ bool RtpDepacketizerH264::ProcessStapAOrSingleNalu(
         break;
       case H264::NaluType::kStapA:
       case H264::NaluType::kFuA:
-        RTC_NOTREACHED();
+        LOG(LS_WARNING) << "Unexpected STAP-A or FU-A received.";
+        return false;
     }
     RTPVideoHeaderH264* h264 = &parsed_payload->type.Video.codecHeader.H264;
     if (h264->nalus_length == kMaxNalusPerPacket) {