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

Commit 9cd14024 authored by Chien-Yu Chen's avatar Chien-Yu Chen
Browse files

Camera3Device: Validate template ID 

Validate template ID before creating a default request.

Bug: 26866110
Change-Id: Ifda457024f1d5c2b1382f189c1a8d5fda852d30d
parent 9322ba85

services/camera/libcameraservice/api2/CameraDeviceClient.cpp

+5 −0
Original line number Diff line number Diff line
@@ -710,6 +710,11 @@ binder::Status CameraDeviceClient::createDefaultRequest(int templateId, 
        request != NULL) {



        request->swap(metadata);

    } else if (err == BAD_VALUE) {

        res = STATUS_ERROR_FMT(CameraService::ERROR_ILLEGAL_ARGUMENT,

                "Camera %d: Template ID %d is invalid or not supported: %s (%d)",

                mCameraId, templateId, strerror(-err), err);



    } else {

        res = STATUS_ERROR_FMT(CameraService::ERROR_INVALID_OPERATION,

                "Camera %d: Error creating default request for template %d: %s (%d)",

services/camera/libcameraservice/device3/Camera3Device.cpp

+7 −0
Original line number Diff line number Diff line
@@ -1237,6 +1237,13 @@ status_t Camera3Device::createDefaultRequest(int templateId, 
        CameraMetadata *request) {

    ATRACE_CALL();

    ALOGV("%s: for template %d", __FUNCTION__, templateId);



    if (templateId <= 0 || templateId >= CAMERA3_TEMPLATE_COUNT) {

        android_errorWriteWithInfoLog(CameraService::SN_EVENT_LOG_ID, "26866110",

                IPCThreadState::self()->getCallingUid(), nullptr, 0);

        return BAD_VALUE;

    }



    Mutex::Autolock il(mInterfaceLock);

    Mutex::Autolock l(mLock);