From 6903e8f0fd174ea6a5ede66df06ff1e6e4df4c17 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Tue, 29 May 2012 12:13:51 +0000 Subject: [PATCH] Bug #1989 fixed. NULL pointer check added. --- modules/androidcamera/camera_wrapper/camera_wrapper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/androidcamera/camera_wrapper/camera_wrapper.cpp b/modules/androidcamera/camera_wrapper/camera_wrapper.cpp index e899a0f54d..727ae6ad77 100644 --- 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)