From f6c003eda5beb9105415ddd824df8ce3e87eeeb3 Mon Sep 17 00:00:00 2001
From: Magnus Jedvert <magjed@webrtc.org>
Date: Fri, 10 Apr 2015 12:44:52 +0200
Subject: [PATCH] cricket::VideoFrameFactory: Handle if created frame is null

R=perkj@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/46869004

Cr-Commit-Position: refs/heads/master@{#8972}
---
 talk/media/base/videoframefactory.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/talk/media/base/videoframefactory.cc b/talk/media/base/videoframefactory.cc
index 4e596119be..ceef75719f 100644
--- a/talk/media/base/videoframefactory.cc
+++ b/talk/media/base/videoframefactory.cc
@@ -40,6 +40,8 @@ VideoFrame* VideoFrameFactory::CreateAliasedFrame(
     int output_height) const {
   rtc::scoped_ptr<VideoFrame> cropped_input_frame(CreateAliasedFrame(
       input_frame, cropped_input_width, cropped_input_height));
+  if (!cropped_input_frame)
+    return nullptr;
 
   if (cropped_input_width == output_width &&
       cropped_input_height == output_height) {