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

content/renderer/pepper/pepper_video_encoder_host.cc

 // Copyright 2015 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 "base/bind.h"
 #include "base/memory/shared_memory.h"
 #include "base/numerics/safe_math.h"
 #include "content/common/gpu/client/command_buffer_proxy_impl.h"
 #include "content/common/gpu/media/gpu_video_accelerator_util.h"
 #include "content/common/pepper_file_util.h"
@@ skipping 614 matching lines @@
   DCHECK(buffer);
   uint32_t shm_offset = static_cast<uint8*>(buffer->video.data) -
                         static_cast<uint8*>(buffer_manager_.shm()->memory());
 
   scoped_refptr<media::VideoFrame> frame =
       media::VideoFrame::WrapExternalSharedMemory(
           media_input_format_, input_coded_size_, gfx::Rect(input_coded_size_),
           input_coded_size_, static_cast<uint8*>(buffer->video.data),
           buffer->video.data_size, buffer_manager_.shm()->handle(), shm_offset,
           base::TimeDelta());
-  frame->AddDestructionObserver(
-      base::Bind(&PepperVideoEncoderHost::FrameReleased,
-                 weak_ptr_factory_.GetWeakPtr(), reply_context, frame_id));
+  if (frame) {
+    frame->AddDestructionObserver(
+        base::Bind(&PepperVideoEncoderHost::FrameReleased,
+                   weak_ptr_factory_.GetWeakPtr(), reply_context, frame_id));
+  } else {

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

Personally I'd prefer a clear error path, but up to you:

if (!frame) {
  DLOG(ERROR)
  NotifyPE();
  return nullptr;
}

frame->AddDO();

return frame;

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

Done.

+    DLOG(ERROR) << "Couldn't create video frame";
+    NotifyPepperError(PP_ERROR_FAILED);
+  }
+
   return frame;
 }
 
 void PepperVideoEncoderHost::FrameReleased(
     const ppapi::host::ReplyMessageContext& reply_context,
     uint32_t frame_id) {
   DCHECK(RenderThreadImpl::current());
 
   ppapi::host::ReplyMessageContext context = reply_context;
   context.params.set_result(encoder_last_error_);
@@ skipping 11 matching lines @@
 }
 
 uint8_t* PepperVideoEncoderHost::ShmHandleToAddress(int32 buffer_id) {
   DCHECK(RenderThreadImpl::current());
   DCHECK_GE(buffer_id, 0);
   DCHECK_LT(buffer_id, static_cast<int32>(shm_buffers_.size()));
   return static_cast<uint8_t*>(shm_buffers_[buffer_id]->shm->memory());
 }
 
 }  // namespace content