From fc7a0312dd2a9dfc0c084e70b5898438875958f0 Mon Sep 17 00:00:00 2001
From: Praveen Chavan <pchavan@codeaurora.org>
Date: Thu, 1 Oct 2015 19:05:19 -0700
Subject: Stagefright: add a NULL check before accessing camera params

Camera may return NULL params if the remote object is dead.
Check for NULL and report error rather than crash.

Change-Id: Id1fcd04dc187aadf00ca4ec5e48fb495c3369c92
CRs-Fixed: 906099
---
 media/libstagefright/CameraSource.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'media/libstagefright/CameraSource.cpp')

diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp
index 41513fb..27a6086 100644
--- a/media/libstagefright/CameraSource.cpp
+++ b/media/libstagefright/CameraSource.cpp
@@ -100,6 +100,11 @@ void CameraSourceListener::postDataTimestamp(
 }
 
 static int32_t getColorFormat(const char* colorFormat) {
+    if (!colorFormat) {
+        ALOGE("Invalid color format");
+        return -1;
+    }
+
     if (!strcmp(colorFormat, CameraParameters::PIXEL_FORMAT_YUV420P)) {
        return OMX_COLOR_FormatYUV420Planar;
     }
-- 
cgit v1.1