commit 15bd6f84645a61d99cd56028446ee912f89b6bd5
author Craig Donner <cdonner@google.com> Mon May 16 18:46:48 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 16 18:46:48 2016 +0000
tree ba65e1ebac1b0462586f71a2e8a9d1e48c333257
parent e1a21c5cef425e0b7b27763e30d8e0fad34234ed
parent 60e7c59430e7acb98bcc4f9e3bc4b87687660853

Merge "Handle lock() returning a NULL buffer in SurfaceUtils." into nyc-dev am: d498419257 am: 98695713bd
am: 60e7c59430

* commit '60e7c59430e7acb98bcc4f9e3bc4b87687660853':
  Handle lock() returning a NULL buffer in SurfaceUtils.

Change-Id: I9bf13abfc1b3848965c4e68a985bd4172eb36a93

media/libstagefright/SurfaceUtils.cpp

diff --git a/media/libstagefright/SurfaceUtils.cpp b/media/libstagefright/SurfaceUtils.cpp
index 9940822..f64bb3e 100644
--- a/media/libstagefright/SurfaceUtils.cpp
+++ b/media/libstagefright/SurfaceUtils.cpp
@@ -168,6 +168,10 @@
             break;
         }
 
+        if (img == NULL) {
+            ALOGE("error pushing blank frames: lock returned NULL buffer");
+            break;
+        }
         *img = 0;
 
         err = buf->unlock();