commit 3e5605b8b8a8f349d70cdb0d53409cfe69cada7b
author Craig Donner <cdonner@google.com> Fri Jul 29 23:36:55 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 29 23:36:55 2016 +0000
tree 0f9a7837de9f1ebabb1c0f7b88fc0a2e73e4ab59
parent f929f9b203ef4787d45f8b24aab053aaab993be9
parent afeffa81d06e7ca485f6d13430b8dfc70b4938a1

Merge "Handle lock() returning a NULL buffer in SurfaceUtils." into nyc-mr1-dev

media/libstagefright/SurfaceUtils.cpp

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