commit 7a00aa1b6fec554c965296eea3dc1d209663bb7e
author Craig Donner <cdonner@google.com> Mon May 16 18:39:26 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 16 18:39:26 2016 +0000
tree 8fbd9e8faeb9066557a57acf08546ee63e98fa73
parent 126e7fd948ac60462cca61027a976959a88c7f10
parent 8244c117585741a298848523e5c7b9ef2a128659

Merge "Handle lock() returning a NULL buffer in SurfaceUtils." into nyc-dev am: d498419257
am: 8244c11758

* commit '8244c117585741a298848523e5c7b9ef2a128659':
  Handle lock() returning a NULL buffer in SurfaceUtils.

Change-Id: I3cad6b3c24c618675f65f29a33ae9f32194612ad

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();