Merge "Camera: fix null pointer dereference" into qt-dev

am: dc7de27113 Change-Id: Ifcd0da978fe11f873e07310ef2513b87ba3415a8
2019-04-23 13:40:33 -07:00
parent fb856af45a dc7de27113
commit 67dc3a6490
1 changed files with 4 additions and 0 deletions
--- a/core/jni/android_hardware_Camera.cpp
+++ b/core/jni/android_hardware_Camera.cpp
@@ -256,6 +256,10 @@ void JNICameraContext::copyAndPost(JNIEnv* env, const sp<IMemory>& dataPtr, int
        ssize_t offset;
        size_t size;
        sp<IMemoryHeap> heap = dataPtr->getMemory(&offset, &size);
+        if (heap == NULL) {
+            ALOGV("copyAndPost: skipping null memory callback!");
+            return;
+        }
        ALOGV("copyAndPost: off=%zd, size=%zu", offset, size);
        uint8_t *heapBase = (uint8_t*)heap->base();