From bc2a37f4a8087425e8a17cf746270e5acf9de049 Mon Sep 17 00:00:00 2001 From: Jayant Chowdhary Date: Mon, 11 Mar 2019 18:12:37 -0700 Subject: [PATCH] camera2 ndk: Add some null checks before dereferencing captureSequenceId. Test: AImageReaderVendorTest Change-Id: Icdb11569305cdbf4e4f9c791b306292e46395271 Signed-off-by: Jayant Chowdhary --- camera/ndk/NdkCameraCaptureSession.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/camera/ndk/NdkCameraCaptureSession.cpp b/camera/ndk/NdkCameraCaptureSession.cpp index ab796fb751..1ac8482ac4 100644 --- a/camera/ndk/NdkCameraCaptureSession.cpp +++ b/camera/ndk/NdkCameraCaptureSession.cpp @@ -105,7 +105,9 @@ camera_status_t ACameraCaptureSession_logicalCamera_capture( 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 @@ camera_status_t ACameraCaptureSession_setRepeatingRequest( 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 @@ camera_status_t ACameraCaptureSession_logicalCamera_setRepeatingRequest( 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; }