commit afeffa81d06e7ca485f6d13430b8dfc70b4938a1
author Craig Donner <cdonner@google.com> Fri May 13 09:29:42 2016 -0700
committer Craig Donner <cdonner@google.com> Thu Jul 28 21:37:38 2016 +0000
tree 92992b1701263a1567ab4477b59fdb8b6e1a7222
parent baf35feefcd14c13a6bf5ff5b651d9f22c2c3de0

Handle lock() returning a NULL buffer in SurfaceUtils.

Bug: 28526999
Change-Id: I99fdc100329e3350c9c8aa070779a407eda057ff
(cherry picked from commit 9193bcd60728bac0d5c2059ed2dc878231509c3a)

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