Bug #1989 fixed. NULL pointer check added.

6903e8f0 · Alexander Smorkalov · d3c73071 · 6903e8f0
Commit 6903e8f0 authored May 29, 2012 by Alexander Smorkalov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

camera_wrapper.cpp modules/androidcamera/camera_wrapper/camera_wrapper.cpp +1 -1

No files found.
--- a/modules/androidcamera/camera_wrapper/camera_wrapper.cpp
+++ b/modules/androidcamera/camera_wrapper/camera_wrapper.cpp
@@ -199,7 +199,7 @@ protected:
    int is_supported(const char* supp_modes_key, const char* mode)
    {
        const char* supported_modes = params.get(supp_modes_key);
-        return strstr(supported_modes, mode) > 0;
+        return (supported_modes && mode && (strstr(supported_modes, mode) > 0));
    }

    float getFocusDistance(int focus_distance_type)