commit 504f1761f2a5c38fc058691ccfc8543bca731db8
author Chong Zhang <chz@google.com> Mon Apr 12 21:54:02 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 12 21:54:02 2021 +0000
tree cd93ffd5d8cf3bfb73c0e6e9042635c412d14fb6
parent 81edbe649584e2594a89838ec88682eda931fd9e
parent aa979c7c7b6f2d90af87fe8d4826def752190e63

Merge "Fix potential null ptr after low memory" into sc-dev

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;
     }