commit a257a531c0e865f8e3ece89cee15b40d93cb5199
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Oct 27 04:10:33 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Oct 27 04:10:33 2016 +0000
tree 47d797c948522abe0dde7d8e0cac769c9e7309ad
parent 5737a69a910de65b67d2703bcb18d6d8058ebe48
parent 2d1bcf2b8f2f23e204adcca45ca134247bdf87f9

Merge "Stagefright: add a NULL check before accessing camera params"

media/libstagefright/CameraSource.cpp

diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp
index 408ad7a..990d4b7 100644
--- a/media/libstagefright/CameraSource.cpp
+++ b/media/libstagefright/CameraSource.cpp
@@ -111,6 +111,11 @@
 }
 
 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;
     }