commit 1f44bfba94d59abc03d0be0ede8fa6efd748c991
author Chong Zhang <chz@google.com> Tue Mar 16 11:45:08 2021 -0700
committer Chong Zhang <chz@google.com> Tue Mar 16 12:32:25 2021 -0700
tree 8f0c656908ce47ec74e6c68087528a46d8efd989
parent da52d86663542d1860adb0bba7f49902f0e67ac9

Handle nullptr if memory allocation fails

bug: 182317379
test: MediaMetadataRetrieverTest
Change-Id: I454f1301567762eea11d194852a814972ca8dd9f

media/libstagefright/FrameDecoder.cpp

diff --git a/media/libstagefright/FrameDecoder.cpp b/media/libstagefright/FrameDecoder.cpp
index a78e6d2..01190b5 100644
--- a/media/libstagefright/FrameDecoder.cpp
+++ b/media/libstagefright/FrameDecoder.cpp
@@ -644,6 +644,10 @@
                 0,
                 dstBpp(),
                 mCaptureLayer != nullptr /*allocRotated*/);
+        if (frameMem == nullptr) {
+            return NO_MEMORY;
+        }
+
         mFrame = static_cast<VideoFrame*>(frameMem->unsecurePointer());
 
         setFrame(frameMem);
@@ -886,6 +890,11 @@
     if (mFrame == NULL) {
         sp<IMemory> frameMem = allocVideoFrame(
                 trackMeta(), mWidth, mHeight, mTileWidth, mTileHeight, dstBpp());
+
+        if (frameMem == nullptr) {
+            return NO_MEMORY;
+        }
+
         mFrame = static_cast<VideoFrame*>(frameMem->unsecurePointer());
 
         setFrame(frameMem);