Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdb7e3c2 authored by Eino-Ville Talvala's avatar Eino-Ville Talvala Committed by Android (Google) Code Review
Browse files

Merge "Camera: Validate face count in received metadata" into rvc-dev

parents 2c4f8cec b393a2d9

camera/ICameraClient.cpp

+5 −0
Original line number Diff line number Diff line
@@ -143,6 +143,11 @@ status_t BnCameraClient::onTransact( 
            if (data.dataAvail() > 0) {

                metadata = new camera_frame_metadata_t;

                metadata->number_of_faces = data.readInt32();

                if (metadata->number_of_faces <= 0 ||

                        metadata->number_of_faces > (int32_t)(INT32_MAX / sizeof(camera_face_t))) {

                    ALOGE("%s: Too large face count: %d", __FUNCTION__, metadata->number_of_faces);

                    return BAD_VALUE;

                }

                metadata->faces = (camera_face_t *) data.readInplace(

                        sizeof(camera_face_t) * metadata->number_of_faces);

            }