commit 7768dedbce78e0bdbed014debd90faef88e9dacb
author Yin-Chia Yeh <yinchiayeh@google.com> Wed Apr 15 12:16:02 2015 -0700
committer Yin-Chia Yeh <yinchiayeh@google.com> Wed Apr 15 13:03:02 2015 -0700
tree b30d60ae6c030dffcc11a75f7bbc26bb722c1674
parent cc0cb8a14acc8ed1760b929fd7f706d800a6ff99

Camera: fix invalid access of static_camera_characteristics

Bug: 20260866
Change-Id: Ib2b9ef807d66989515ac1a2e9f623fdd226a665a

services/camera/libcameraservice/common/CameraModule.cpp

diff --git a/services/camera/libcameraservice/common/CameraModule.cpp b/services/camera/libcameraservice/common/CameraModule.cpp
index e5b12ae..b861d71 100644
--- a/services/camera/libcameraservice/common/CameraModule.cpp
+++ b/services/camera/libcameraservice/common/CameraModule.cpp
@@ -78,6 +78,12 @@
         if (ret != 0) {
             return ret;
         }
+        int deviceVersion = cameraInfo.device_version;
+        if (deviceVersion < CAMERA_DEVICE_API_VERSION_2_0) {
+            // static_camera_characteristics is invalid
+            *info = rawInfo;
+            return ret;
+        }
         CameraMetadata m;
         m = rawInfo.static_camera_characteristics;
         deriveCameraCharacteristicsKeys(rawInfo.device_version, m);