From c5b732b2caacdedde53160e9cf4adc6901fb7454 Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Tue, 1 Dec 2020 17:12:19 +0100 Subject: android: camera_device: Check capture_request validity Make sure the 'camera3_capture_request_t *' provided to CameraDevice::processCaptureRequest() is valid before attempting to access it. This patch fixes cros_camera_test: Camera3FrameTest/Camera3InvalidRequestTest.NullOrUnconfiguredRequest/* Reviewed-by: Laurent Pinchart Signed-off-by: Jacopo Mondi --- src/android/camera_device.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/android/camera_device.cpp') diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 4eb05df0..675af570 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1398,6 +1398,11 @@ FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Request) { + if (!camera3Request) { + LOG(HAL, Error) << "No capture request provided"; + return -EINVAL; + } + if (!camera3Request->num_output_buffers) { LOG(HAL, Error) << "No output buffers provided"; return -EINVAL; -- cgit v1.2.1