Add missing NULL checking

Change-Id: I0d8b9a7d95c3a227e26e1ee83d13ca60f11e619b

diff --git a/client/ma.c b/client/ma.c
index cd7135ab00d4977abc3dcbe01328488b58af24c7..8eadce7da6964b126ef51490dcb124e58c24fb6c 100644 (file)
--- a/client/ma.c
+++ b/client/ma.c
@@ -2185,9 +2185,13 @@ int ma_get_wakeup_info_wake_word(char** wake_word)
        ret = __ma_validate_client(false, false, NULL);
        if (MA_ERROR_NONE != ret) return ret;
 
-       if (wake_word) {
-               *wake_word = strdup(g_wakeup_info.wake_word);
+       if (NULL == wake_word) {
+               MA_SLOGE("[ERROR] Invalid parameter"); //LCOV_EXCL_LINE
+               return MA_ERROR_INVALID_PARAMETER;
        }
+
+       *wake_word = strdup(g_wakeup_info.wake_word);
+
        return 0;
 }
 
@@ -2197,19 +2201,17 @@ int ma_get_wakeup_info_extra_data(unsigned char** extra_data, int* extra_data_le
        ret = __ma_validate_client(false, false, NULL);
        if (MA_ERROR_NONE != ret) return ret;
 
-       if (extra_data) {
-               *extra_data = (unsigned char*)malloc(g_wakeup_info.extra_data_length);
-               if (*extra_data)
-                       memcpy(*extra_data, g_wakeup_info.extra_data, g_wakeup_info.extra_data_length);
+       if (NULL == extra_data || NULL == extra_data_length || NULL == extra_data_desc) {
+               MA_SLOGE("[ERROR] Invalid parameter"); //LCOV_EXCL_LINE
+               return MA_ERROR_INVALID_PARAMETER;
        }
 
-       if (extra_data_length) {
-               *extra_data_length = g_wakeup_info.extra_data_length;
-       }
+       *extra_data = (unsigned char*)malloc(g_wakeup_info.extra_data_length);
+       if (*extra_data)
+               memcpy(*extra_data, g_wakeup_info.extra_data, g_wakeup_info.extra_data_length);
 
-       if (extra_data_desc) {
-               *extra_data_desc = strdup(g_wakeup_info.extra_data_desc);
-       }
+       *extra_data_length = g_wakeup_info.extra_data_length;
+       *extra_data_desc = strdup(g_wakeup_info.extra_data_desc);
 
        return 0;
 }