From cfdd84284394cecdb33cf121fe6d4205da84c761 Mon Sep 17 00:00:00 2001 From: Igor Murashkin Date: Mon, 8 Oct 2012 11:16:03 -0700 Subject: [PATCH] Camera2: Fix Parameters#setZoom off by 1 validation error Bug: 7298683 Change-Id: If79ac6396379593eb852f041ca7d5a20ad2f9e6d --- services/camera/libcameraservice/camera2/Parameters.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/services/camera/libcameraservice/camera2/Parameters.cpp b/services/camera/libcameraservice/camera2/Parameters.cpp index 809768c2eb..4d5112083d 100644 --- a/services/camera/libcameraservice/camera2/Parameters.cpp +++ b/services/camera/libcameraservice/camera2/Parameters.cpp @@ -1514,7 +1514,8 @@ status_t Parameters::set(const String8& paramString) { // ZOOM validatedParams.zoom = newParams.getInt(CameraParameters::KEY_ZOOM); - if (validatedParams.zoom < 0 || validatedParams.zoom > (int)NUM_ZOOM_STEPS) { + if (validatedParams.zoom < 0 + || validatedParams.zoom >= (int)NUM_ZOOM_STEPS) { ALOGE("%s: Requested zoom level %d is not supported", __FUNCTION__, validatedParams.zoom); return BAD_VALUE; -- 2.11.0