From 395c7c65194988f1102f461ed9ff0cf932f72748 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= Date: Fri, 27 Nov 2015 15:23:12 +0100 Subject: [PATCH] Re-add missing return in RegisterExternalDecoder. Breaks waterfall due to possible null-pointer dereferences. BUG=webrtc:5249 TBR=stefan@webrtc.org Review URL: https://codereview.webrtc.org/1483623002 . Cr-Commit-Position: refs/heads/master@{#10824} --- webrtc/modules/video_coding/video_receiver.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/webrtc/modules/video_coding/video_receiver.cc b/webrtc/modules/video_coding/video_receiver.cc index e2720f685b..c347baa7b8 100644 --- a/webrtc/modules/video_coding/video_receiver.cc +++ b/webrtc/modules/video_coding/video_receiver.cc @@ -245,6 +245,7 @@ void VideoReceiver::RegisterExternalDecoder(VideoDecoder* externalDecoder, // Make sure the VCM updates the decoder next time it decodes. _decoder = NULL; RTC_CHECK(_codecDataBase.DeregisterExternalDecoder(payloadType)); + return; } _codecDataBase.RegisterExternalDecoder(externalDecoder, payloadType, internalRenderTiming);