commit bc2a37f4a8087425e8a17cf746270e5acf9de049
author Jayant Chowdhary <jchowdhary@google.com> Mon Mar 11 18:12:37 2019 -0700
committer Jayant Chowdhary <jchowdhary@google.com> Mon Mar 11 18:14:16 2019 -0700
tree d7b13f22f7952c3600519546a4fff750eb828421
parent 0428b8e5a53c3c37e0f76decc7a8f32854488062

camera2 ndk: Add some null checks before dereferencing captureSequenceId.

Test: AImageReaderVendorTest

Change-Id: Icdb11569305cdbf4e4f9c791b306292e46395271
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 ab796fb..1ac8482 100644
--- a/camera/ndk/NdkCameraCaptureSession.cpp
+++ b/camera/ndk/NdkCameraCaptureSession.cpp
@@ -105,7 +105,9 @@
 
     if (session->isClosed()) {
         ALOGE("%s: session %p is already closed", __FUNCTION__, session);
-        *captureSequenceId = CAPTURE_SEQUENCE_ID_NONE;
+        if (captureSequenceId) {
+            *captureSequenceId = CAPTURE_SEQUENCE_ID_NONE;
+        }
         return ACAMERA_ERROR_SESSION_CLOSED;
     }
 
@@ -127,7 +129,9 @@
 
     if (session->isClosed()) {
         ALOGE("%s: session %p is already closed", __FUNCTION__, session);
-        *captureSequenceId = CAPTURE_SEQUENCE_ID_NONE;
+        if (captureSequenceId) {
+            *captureSequenceId = CAPTURE_SEQUENCE_ID_NONE;
+        }
         return ACAMERA_ERROR_SESSION_CLOSED;
     }
 
@@ -149,7 +153,9 @@
 
     if (session->isClosed()) {
         ALOGE("%s: session %p is already closed", __FUNCTION__, session);
-        *captureSequenceId = CAPTURE_SEQUENCE_ID_NONE;
+        if (captureSequenceId) {
+            *captureSequenceId = CAPTURE_SEQUENCE_ID_NONE;
+        }
         return ACAMERA_ERROR_SESSION_CLOSED;
     }