Verify returned frames from media::VideoFrame::Wrap*() methods

media/filters/vpx_video_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/vpx_video_decoder.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 446 matching lines @@
     *video_frame = nullptr;
     return true;
   }
 
   if (vpx_image->user_priv != user_priv) {
     DLOG(ERROR) << "Invalid output timestamp.";
     return false;
   }
 
   CopyVpxImageToVideoFrame(vpx_image, video_frame);
+  if (!video_frame->get()) {
+    DLOG(ERROR) << "Couldn't create video frame";
+    return false;
+  }
   (*video_frame)->set_timestamp(base::TimeDelta::FromMicroseconds(timestamp));
 
   // Default to the color space from the config, but if the bistream specifies
   // one, prefer that instead.
   ColorSpace color_space = config_.color_space();
   if (vpx_image->cs == VPX_CS_BT_709)
     color_space = COLOR_SPACE_HD_REC709;
   else if (vpx_image->cs == VPX_CS_BT_601)
     color_space = COLOR_SPACE_SD_REC601;
   (*video_frame)
@@ skipping 92 matching lines @@
     *video_frame = VideoFrame::WrapExternalYuvData(
         codec_format,
         coded_size, gfx::Rect(visible_size), config_.natural_size(),
         vpx_image->stride[VPX_PLANE_Y],
         vpx_image->stride[VPX_PLANE_U],
         vpx_image->stride[VPX_PLANE_V],
         vpx_image->planes[VPX_PLANE_Y],
         vpx_image->planes[VPX_PLANE_U],
         vpx_image->planes[VPX_PLANE_V],
         kNoTimestamp());
-    video_frame->get()->AddDestructionObserver(
-        memory_pool_->CreateFrameCallback(vpx_image->fb_priv));
+    if (video_frame->get())
+      video_frame->get()->AddDestructionObserver(
+          memory_pool_->CreateFrameCallback(vpx_image->fb_priv));
 
     UMA_HISTOGRAM_COUNTS("Media.Vpx.VideoDecoderBuffersInUseByDecoder",
                          memory_pool_->NumberOfFrameBuffersInUseByDecoder());
     UMA_HISTOGRAM_COUNTS(
         "Media.Vpx.VideoDecoderBuffersInUseByDecoderAndVideoFrame",
         memory_pool_->NumberOfFrameBuffersInUseByDecoderAndVideoFrame());
 
     return;
   }
 
   DCHECK(codec_format == PIXEL_FORMAT_YV12 ||
          codec_format == PIXEL_FORMAT_YV12A);
 
   *video_frame = frame_pool_.CreateFrame(

[Pawel Osciak, 2015/11/26 01:19:03]

I think this may also fail and return nullptr.

[emircan, 2015/12/04 04:20:09]

My bad. I was trying to handle nullptr in the return on l.467. Changing it.

       codec_format, visible_size, gfx::Rect(visible_size),
       config_.natural_size(), kNoTimestamp());
 
   libyuv::I420Copy(
       vpx_image->planes[VPX_PLANE_Y], vpx_image->stride[VPX_PLANE_Y],
       vpx_image->planes[VPX_PLANE_U], vpx_image->stride[VPX_PLANE_U],
       vpx_image->planes[VPX_PLANE_V], vpx_image->stride[VPX_PLANE_V],
       (*video_frame)->visible_data(VideoFrame::kYPlane),
       (*video_frame)->stride(VideoFrame::kYPlane),
       (*video_frame)->visible_data(VideoFrame::kUPlane),
       (*video_frame)->stride(VideoFrame::kUPlane),
       (*video_frame)->visible_data(VideoFrame::kVPlane),
       (*video_frame)->stride(VideoFrame::kVPlane), coded_size.width(),
       coded_size.height());
 }
 
 }  // namespace media