From 518f8dc91cc954b360b39e2df57a0ea6cec307b0 Mon Sep 17 00:00:00 2001 From: Shuzhen Wang Date: Tue, 24 May 2016 18:57:58 -0700 Subject: QCamera2: HAL3: Avoid array overrun for face detection Bug: 28941005 Change-Id: I651c12d31378f8410b1fea7c19726116f1f84ecb --- camera/QCamera2/HAL3/QCamera3HWI.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/camera/QCamera2/HAL3/QCamera3HWI.cpp b/camera/QCamera2/HAL3/QCamera3HWI.cpp index cbf23d39..c35a7f04 100644 --- a/camera/QCamera2/HAL3/QCamera3HWI.cpp +++ b/camera/QCamera2/HAL3/QCamera3HWI.cpp @@ -2984,7 +2984,7 @@ QCamera3HardwareInterface::translateFromHalMetadata( if (IS_META_AVAILABLE(CAM_INTF_META_FACE_DETECTION, metadata)){ cam_face_detection_data_t *faceDetectionInfo = (cam_face_detection_data_t *)POINTER_OF_META(CAM_INTF_META_FACE_DETECTION, metadata); - uint8_t numFaces = faceDetectionInfo->num_faces_detected; + uint8_t numFaces = MIN(faceDetectionInfo->num_faces_detected, MAX_ROI); int32_t faceIds[MAX_ROI]; uint8_t faceScores[MAX_ROI]; int32_t faceRectangles[MAX_ROI * 4]; -- cgit v1.2.3