commit 691b4289fc98c15dcde57a9201f1814a343b1453
author Steve Kondik <shade@chemlab.org> Wed May 01 02:58:11 2013 -0700
committer Ricardo Cerqueira <cyanogenmod@cerqueira.org> Sun Nov 03 02:45:27 2013 +0000
tree e816b219381797294305923bc7ec9aeb802c8894
parent 12c66985ae4177feb73bbcc709ef80a18660ebec

camera: Don't segfault if we get a NULL parameter

 * Values end up NULL on some drivers, don't crash.

Change-Id: Ic897dbd4629cf3af98c85f93be202c382dde806b

camera/CameraParameters.cpp

diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index 9b4c2e2..0b10bec 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -503,6 +503,9 @@
 
 void CameraParameters::set(const char *key, const char *value)
 {
+    if (key == NULL || value == NULL)
+        return;
+
     // XXX i think i can do this with strspn()
     if (strchr(key, '=') || strchr(key, ';')) {
         //XXX ALOGE("Key \"%s\"contains invalid character (= or ;)", key);