diff options
| author | Shuzhen Wang <shuzhenwang@google.com> | 2016-05-25 20:16:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-25 20:16:33 +0000 |
| commit | ce64ad0febf9419b11a646a8bd8493dd5843ff84 (patch) | |
| tree | c18534f26b641af5353da8cf554b15b92a84d48d | |
| parent | 47318bf0f9a7730aad4f46f9c0b32e576bb954ee (diff) | |
| parent | 518f8dc91cc954b360b39e2df57a0ea6cec307b0 (diff) | |
| download | shamu-ce64ad0febf9419b11a646a8bd8493dd5843ff84.tar.gz | |
QCamera2: HAL3: Avoid array overrun for face detection
am: 518f8dc91c
* commit '518f8dc91cc954b360b39e2df57a0ea6cec307b0':
QCamera2: HAL3: Avoid array overrun for face detection
Change-Id: I73215f0ace0216fb6ee329834bacc238a8deebd1
| -rw-r--r-- | camera/QCamera2/HAL3/QCamera3HWI.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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]; |