commit 76ba73f7ed1b172efed2dd76bc3877f1a607dc0c
author Jayant Chowdhary <jchowdhary@google.com> Mon Jan 14 17:11:05 2019 -0800
committer Jayant Chowdhary <jchowdhary@google.com> Mon Jan 14 17:11:08 2019 -0800
tree d95c75089721840257eeb1f6fd4d4ee328bcb474
parent 937dba18c32af5030999daf8d4e9aa3d4cf3b705

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

diff --git a/camera/ndk/NdkCameraCaptureSession.cpp b/camera/ndk/NdkCameraCaptureSession.cpp
index 540d84e..ab796fb 100644
--- a/camera/ndk/NdkCameraCaptureSession.cpp
+++ b/camera/ndk/NdkCameraCaptureSession.cpp
@@ -80,7 +80,9 @@
 
     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;
     }