From 3ef060eff5d589656aecdd24f7bf6c6ad6a72d92 Mon Sep 17 00:00:00 2001
From: Yin-Chia Yeh <yinchiayeh@google.com>
Date: Thu, 18 Apr 2019 15:55:05 -0700
Subject: [PATCH] Camera: fix null pointer dereference

Test: N/A (no device to repro)
Bug: 128569845
Change-Id: Iff13846b6d2d0e9472d8d5b5af256aae1f744535
---
 core/jni/android_hardware_Camera.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/jni/android_hardware_Camera.cpp b/core/jni/android_hardware_Camera.cpp
index 61d5031e16ed4..b49998157ad2b 100644
--- 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();