From 76ba73f7ed1b172efed2dd76bc3877f1a607dc0c Mon Sep 17 00:00:00 2001
From: Jayant Chowdhary <jchowdhary@google.com>
Date: Mon, 14 Jan 2019 17:11:05 -0800
Subject: [PATCH] camera2 ndk: Check for nullptr before assigning
 captureSequenceId.

Bug: 122853890

Test: mm -j64
Test: AImageReaderVendorTest

Change-Id: I9520abdaecf60401dad614481ca98195501c52e8
Signed-off-by: Jayant Chowdhary <jchowdhary@google.com>
---
 camera/ndk/NdkCameraCaptureSession.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/camera/ndk/NdkCameraCaptureSession.cpp b/camera/ndk/NdkCameraCaptureSession.cpp
index 540d84e43b..ab796fb751 100644
--- a/camera/ndk/NdkCameraCaptureSession.cpp
+++ b/camera/ndk/NdkCameraCaptureSession.cpp
@@ -80,7 +80,9 @@ camera_status_t ACameraCaptureSession_capture(
 
     if (session->isClosed()) {
         ALOGE("%s: session %p is already closed", __FUNCTION__, session);
-        *captureSequenceId = CAPTURE_SEQUENCE_ID_NONE;
+        if (captureSequenceId != nullptr) {
+            *captureSequenceId = CAPTURE_SEQUENCE_ID_NONE;
+        }
         return ACAMERA_ERROR_SESSION_CLOSED;
     }