From 6940b4572becf672c018a77ab9f8c00c13a3ca99 Mon Sep 17 00:00:00 2001 From: Steve Kondik Date: Wed, 1 May 2013 02:58:11 -0700 Subject: 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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp index e65d219..d86e0f3 100644 --- a/camera/CameraParameters.cpp +++ b/camera/CameraParameters.cpp @@ -520,6 +520,9 @@ void CameraParameters::unflatten(const String8 ¶ms) 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); -- cgit v1.1