commit 3ef060eff5d589656aecdd24f7bf6c6ad6a72d92
author Yin-Chia Yeh <yinchiayeh@google.com> Thu Apr 18 15:55:05 2019 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Thu Apr 18 15:55:05 2019 -0700
tree 3b464c3a1aecad7d18d770c57860bfd6c46c4ae1
parent 0cae839130ef513c67dc2acfda001d67e19d8be2

Camera: fix null pointer dereference

Test: N/A (no device to repro)
Bug: 128569845
Change-Id: Iff13846b6d2d0e9472d8d5b5af256aae1f744535

core/jni/android_hardware_Camera.cpp

diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp
index 61d5031..b499981 100644
--- a/core/jni/android_hardware_Camera.cpp
+++ b/core/jni/android_hardware_Camera.cpp
@@ -256,6 +256,10 @@
         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();