commit fde903de5e26fe73012cb318d4d0f3697c120369
author Steve Kondik <shade@chemlab.org> Wed May 01 02:58:11 2013 -0700
committer andrew.boren <andrew.boren@gmail.com> Sun May 26 21:52:42 2013 -0700
tree b17c99403d3a6c1ae9d476fbf2ae35a367aac6ca
parent 06b203e48d0449b76890dedaa7f978ebbc20ec39

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 69d908f..41c4354 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -515,6 +515,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);