From 6d0aafd0f47196f2caafe813cd06e4af544e1363 Mon Sep 17 00:00:00 2001 From: Dean Lee Date: Fri, 21 Feb 2025 02:57:20 +0800 Subject: [PATCH] camerad: fix null dereference in camera_bufs_raw when accessing cur_camera_buf (#34635) Fix null dereference in camera_bufs_raw --- system/camerad/cameras/camera_common.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/system/camerad/cameras/camera_common.cc b/system/camerad/cameras/camera_common.cc index 28204d7112..f63a48b733 100644 --- a/system/camerad/cameras/camera_common.cc +++ b/system/camerad/cameras/camera_common.cc @@ -57,7 +57,9 @@ bool CameraBuf::acquire() { } cur_frame_data = frame_metadata[cur_buf_idx]; - cur_camera_buf = &camera_bufs_raw[cur_buf_idx]; + if (camera_bufs_raw) { + cur_camera_buf = &camera_bufs_raw[cur_buf_idx]; + } cur_yuv_buf = vipc_server->get_buffer(stream_type, cur_buf_idx); cur_frame_data.processing_time = (double)(cur_frame_data.timestamp_end_of_isp - cur_frame_data.timestamp_eof)*1e-9;