From de20029a582a71a87d99388a62fb63c86e85028a Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 8 Sep 2020 10:48:46 +0300 Subject: android: Protect against null callbacks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit According to the Android camera HAL C interface documentation, the camera service is supposed to set callbacks after initializing the HAL and calling get_number_of_cameras(), before any other calls to the module. We rely on this behaviour and use callbacks unconditionally, which would lead to a crash if the camera service behaved incorrectly. While the camera service isn't supposed to behave incorrectly, gracefully handling the error when opening cameras isn't costly, and provides better diagnostic than a crash. While at it, removed an unneeded [[maybe_unused]] attribute. Reported-by: Coverity CID=298638 Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Reviewed-by: Umang Jain Reviewed-by: Kieran Bingham --- src/android/camera3_hal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/android/camera3_hal.cpp') diff --git a/src/android/camera3_hal.cpp b/src/android/camera3_hal.cpp index 67a497b8..d6e04af2 100644 --- a/src/android/camera3_hal.cpp +++ b/src/android/camera3_hal.cpp @@ -32,7 +32,7 @@ static int hal_get_camera_info(int id, struct camera_info *info) return cameraManager.getCameraInfo(id, info); } -static int hal_set_callbacks([[maybe_unused]] const camera_module_callbacks_t *callbacks) +static int hal_set_callbacks(const camera_module_callbacks_t *callbacks) { cameraManager.setCallbacks(callbacks); -- cgit v1.2.1