commit aa979c7c7b6f2d90af87fe8d4826def752190e63
author Chong Zhang <chz@google.com> Mon Apr 12 11:01:13 2021 -0700
committer Chong Zhang <chz@google.com> Mon Apr 12 11:03:16 2021 -0700
tree eba0b24e10b559e1c63472fca409b21ab645b117
parent d8e0c1f8164c25476063a80744ad21cf1b8f457b

Fix potential null ptr after low memory

bug: 180962323
test: atest android.media.cts.MediaMetadataRetrieverTest
Change-Id: Iac064687e55912d9eff4e30823ad5694f48c27e6

media/libstagefright/FrameDecoder.cpp

diff --git a/media/libstagefright/FrameDecoder.cpp b/media/libstagefright/FrameDecoder.cpp
index 01190b5..0fd4ef2 100644
--- a/media/libstagefright/FrameDecoder.cpp
+++ b/media/libstagefright/FrameDecoder.cpp
@@ -113,7 +113,7 @@
         return NULL;
     }
     sp<IMemory> frameMem = new MemoryBase(heap, 0, size);
-    if (frameMem == NULL) {
+    if (frameMem == NULL || frameMem->unsecurePointer() == NULL) {
         ALOGE("not enough memory for VideoFrame size=%zu", size);
         return NULL;
     }