[0.6.202] fix coverity issue

Change-Id: I3c09736bbb6da32465d4207bd495b604727c0cba

diff --git a/src/mm_player_attrs.c b/src/mm_player_attrs.c
index e53ca7b25b7b30cf5dcc7b9546828b3f098d5b1a..eb9a17b92751318b8df93aafcbc021be7cc75d0a 100644 (file)
--- a/src/mm_player_attrs.c
+++ b/src/mm_player_attrs.c
@@ -933,17 +933,17 @@ static int __mmplayer_get_available_format(MMHandleType handle, int type, int **
                return -1;
 
        arr = (int *) g_malloc0(count * sizeof(int));
-       if (arr == NULL) {
-               LOGE("malloc failed : %zu", count * sizeof(int));
-               return -1;
-       }
-
        for (i = 0 ; i < count ; i++) {
                fmt = __mmplayer_get_supported_format_mimetype(handle, type, i);
                if (fmt != MEDIA_FORMAT_MAX)
                        arr[total_count++] = fmt;
        }
 
+       if (total_count <= 0) {
+               g_free(arr);
+               return -1;
+       }
+
        LOGD("[%d type] num of supported codec %d", type, total_count);
 
        *format = arr;
@@ -979,18 +979,14 @@ static int __mmplayer_release_ini_info(void)
        MMPLAYER_FENTER();
 
        mem = (int *)(player_attrs[MMPLAYER_ATTRS_AUDIO_OFFLOAD_FORMAT].validity_value_1.int_array);
-       if (mem) {
-               free(mem);
-               player_attrs[MMPLAYER_ATTRS_AUDIO_OFFLOAD_FORMAT].validity_value_1.int_array = NULL;
-               player_attrs[MMPLAYER_ATTRS_AUDIO_OFFLOAD_FORMAT].validity_value_2.count = 0;
-       }
+       g_free(mem);
+       player_attrs[MMPLAYER_ATTRS_AUDIO_OFFLOAD_FORMAT].validity_value_1.int_array = NULL;
+       player_attrs[MMPLAYER_ATTRS_AUDIO_OFFLOAD_FORMAT].validity_value_2.count = 0;
 
        mem = (int *)(player_attrs[MMPLAYER_ATTRS_MEDIA_STREAM_INPUT_FORMAT].validity_value_1.int_array);
-       if (mem) {
-               free(mem);
-               player_attrs[MMPLAYER_ATTRS_MEDIA_STREAM_INPUT_FORMAT].validity_value_1.int_array = NULL;
-               player_attrs[MMPLAYER_ATTRS_MEDIA_STREAM_INPUT_FORMAT].validity_value_2.count = 0;
-       }
+       g_free(mem);
+       player_attrs[MMPLAYER_ATTRS_MEDIA_STREAM_INPUT_FORMAT].validity_value_1.int_array = NULL;
+       player_attrs[MMPLAYER_ATTRS_MEDIA_STREAM_INPUT_FORMAT].validity_value_2.count = 0;
 
        MMPLAYER_FLEAVE();
        return MM_ERROR_NONE;

diff --git a/src/mm_player_priv.c b/src/mm_player_priv.c
index dc3f5472a98e9d9752f2043d6bd03dee7540e9b6..d297f1e848873293a82953b204a8ccb838b0379d 100644 (file)
--- a/src/mm_player_priv.c
+++ b/src/mm_player_priv.c
@@ -4121,8 +4121,6 @@ __mmplayer_gst_create_pipeline(mmplayer_t *player)
        }
 
        player->pipeline = (mmplayer_pipeline_info_t *)g_malloc0(sizeof(mmplayer_pipeline_info_t));
-       if (player->pipeline == NULL)
-               goto INIT_ERROR;
 
        /* create mainbin */
        mainbin = (mmplayer_gst_element_t *)g_try_malloc0(sizeof(mmplayer_gst_element_t) * MMPLAYER_M_NUM);
@@ -6722,7 +6720,7 @@ __mmplayer_gst_decode_autoplug_continue(GstElement *bin,  GstPad *pad,
 static gboolean
 __mmplayer_is_audio_offload_device_type(mmplayer_t *player)
 {
-       gboolean ret = TRUE;
+       gboolean ret = FALSE;
        GDBusConnection *conn = NULL;
        GError *err = NULL;
        GVariant *result = NULL;
@@ -6734,7 +6732,6 @@ __mmplayer_is_audio_offload_device_type(mmplayer_t *player)
        if (!conn || err) {
                LOGE("failed g_bus_get_sync() (%s)", err ? err->message : NULL);
                g_error_free(err);
-               ret = FALSE;
                goto DONE;
        }
 
@@ -6752,7 +6749,6 @@ __mmplayer_is_audio_offload_device_type(mmplayer_t *player)
        if (!result || err) {
                LOGE("failed g_dbus_connection_call_sync() (%s)", err ? err->message : NULL);
                g_error_free(err);
-               ret = FALSE;
                goto DONE;
        }
 
@@ -6760,10 +6756,8 @@ __mmplayer_is_audio_offload_device_type(mmplayer_t *player)
        g_variant_get(result, "(&s&s)", &dbus_device_type, &dbus_ret);
 
        LOGI("g_dbus_connection_call_sync() success (%s, %s)", dbus_device_type, dbus_ret);
-       if (strncmp("STREAM_MANAGER_RETURN_OK", dbus_ret, strlen(dbus_ret))) {
-               ret = FALSE;
+       if (strncmp("STREAM_MANAGER_RETURN_OK", dbus_ret, strlen(dbus_ret)))
                goto DONE;
-       }
 
        /* the device type is listed in ini file among audio-jack, bt-a2dp, usb-audio, builtin-speaker */
        for (idx = 0; player->ini.audio_offload_device_type[idx][0] != '\0'; idx++) {
@@ -6775,11 +6769,11 @@ __mmplayer_is_audio_offload_device_type(mmplayer_t *player)
        }
 
        LOGD("audio offload is not supportable");
-       ret = FALSE;
 
 DONE:
        g_variant_unref(result);
-       g_object_unref(conn);
+       if (conn)
+               g_object_unref(conn);
 
        return ret;
 }