commit d5ae6ae6b5599fb47a17656ec092ff923609a8d2
author sergeyu <sergeyu@chromium.org> Sat Sep 05 01:38:07 2015
committer Commit bot <commit-bot@chromium.org> Sat Sep 05 01:38:15 2015
tree 65388cf7f877d1093983e88653e31986d8bbc4b2
parent 3cc834ae8628ef042497d8effe4bd223235bcd28

Fix ScreenCapturerWinGdi to handle DesktopFrameWin::Create() errors.

DesktopFrameWin::Create() may return nullptr when it fails to allocate
windows bitmap. ScreenCapturerWinGdi wasn't handling that case properly.

BUG=527660

Review URL: https://codereview.webrtc.org/1309143007

Cr-Commit-Position: refs/heads/master@{#9865}

webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc

diff --git a/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc b/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc
index 352433e..4d76fce 100644
--- a/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc
+++ b/webrtc/modules/desktop_capture/win/screen_capturer_win_gdi.cc
@@ -241,9 +241,10 @@
         DesktopFrame::kBytesPerPixel;
     SharedMemory* shared_memory = callback_->CreateSharedMemory(buffer_size);
 
-    rtc::scoped_ptr<DesktopFrame> buffer;
-    buffer.reset(
+    rtc::scoped_ptr<DesktopFrame> buffer(
         DesktopFrameWin::Create(size, shared_memory, desktop_dc_));
+    if (!buffer.get())
+      return false;
     queue_.ReplaceCurrentFrame(buffer.release());
   }