[0.6.163] Modified for correct memory alloc and free function

Change-Id: I44f356a7795b6fdfe5af71f60951fab39290c736

diff --git a/packaging/libmm-player.spec b/packaging/libmm-player.spec
index cb27e2f..e279330 100644 (file)
--- a/packaging/libmm-player.spec
+++ b/packaging/libmm-player.spec
@@ -1,6 +1,6 @@
 Name:       libmm-player
 Summary:    Multimedia Framework Player Library
-Version:    0.6.162
+Version:    0.6.163
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/src/mm_player.c b/src/mm_player.c
index 862fd30..94a2e91 100644 (file)
--- a/src/mm_player.c
+++ b/src/mm_player.c
@@ -40,23 +40,22 @@
 int mm_player_create(MMHandleType *player)
 {
        int result = MM_ERROR_PLAYER_INTERNAL;
-       mm_player_t* new_player = NULL;
+       mm_player_t *new_player = NULL;
 
        MMPLAYER_RETURN_VAL_IF_FAIL(player, MM_ERROR_PLAYER_NOT_INITIALIZED);
 
        /* alloc player structure */
-       new_player = g_malloc(sizeof(mm_player_t));
+       new_player = g_try_new0(mm_player_t, 1);
        if (!new_player) {
                LOGE("Cannot allocate memory for player\n");
                result = MM_ERROR_PLAYER_RESOURCE_LIMIT;
                goto ERROR;
        }
-       memset(new_player, 0, sizeof(mm_player_t));
 
-       /* create player lock */
+       /* create player cmd lock */
        g_mutex_init(&new_player->cmd_lock);
 
-       /* create player lock */
+       /* create player playback lock */
        g_mutex_init(&new_player->playback_lock);
 
        /* load ini files */
@@ -113,13 +112,13 @@ int  mm_player_destroy(MMHandleType player)
 
        MMPLAYER_CMD_UNLOCK(player);
 
-       g_mutex_clear(&((mm_player_t*)player)->cmd_lock);
-       g_mutex_clear(&((mm_player_t*)player)->playback_lock);
+       g_mutex_clear(&((mm_player_t *)player)->cmd_lock);
+       g_mutex_clear(&((mm_player_t *)player)->playback_lock);
 
-       memset((mm_player_t*)player, 0x00, sizeof(mm_player_t));
+       memset((mm_player_t *)player, 0x00, sizeof(mm_player_t));
 
        /* free player */
-       g_free((void*)player);
+       g_free((void *)player);
 
        return result;
 }

diff --git a/src/mm_player_attrs.c b/src/mm_player_attrs.c
index 7af185f..64e9a72 100644 (file)
--- a/src/mm_player_attrs.c
+++ b/src/mm_player_attrs.c
@@ -723,8 +723,7 @@ _mmplayer_construct_attribute(MMHandleType handle)
 
        num_of_attrs = ARRAY_SIZE(player_attrs);
 
-       base = (MMAttrsConstructInfo*)malloc(num_of_attrs * sizeof(MMAttrsConstructInfo));
-
+       base = g_try_new(MMAttrsConstructInfo, num_of_attrs);
        if (!base) {
                LOGE("failed to alloc attrs constructor");
                return 0;

diff --git a/src/mm_player_capture.c b/src/mm_player_capture.c
index c0ff4c8..6ed0a0a 100644 (file)
--- a/src/mm_player_capture.c
+++ b/src/mm_player_capture.c
@@ -211,7 +211,7 @@ __mmplayer_handle_orientation(mm_player_t* player, int orientation, int format)
 
        /* height & width will be interchanged for 90 and 270 orientation */
        LOGD("before rotation : dst_width = %d and dst_height = %d", dst_width, dst_height);
-       src_buffer = (unsigned char*)player->capture.data;
+       src_buffer = (unsigned char *)player->capture.data;
 
        /* convert orientation degree into enum here */
        switch (orientation) {
@@ -242,7 +242,7 @@ __mmplayer_handle_orientation(mm_player_t* player, int orientation, int format)
 
        LOGD("after rotation same stride: dst_width = %d and dst_height = %d, dst_size = %zu", dst_width, dst_height, dst_size);
 
-       g_free(src_buffer);
+       free(src_buffer);
 
        player->capture.data = dst_frame;
        player->capture.size = (int)dst_size;
@@ -492,7 +492,7 @@ __mm_player_convert_colorspace(mm_player_t* player, unsigned char* src_data, mm_
        ret = mm_util_convert_colorspace(src_data, src_w, src_h, src_fmt, dst_fmt, &dst_data, &dst_width, &dst_height, &dst_size);
        if (ret != MM_ERROR_NONE || !dst_data) {
                LOGE("failed to convert for capture, %d\n", ret);
-               g_free(dst_data);
+               free(dst_data);
                return MM_ERROR_PLAYER_INTERNAL;
        }
        SECURE_LOGD("dst size info. width: %d, height: %d, size: %zu\n", dst_width, dst_height, dst_size);

diff --git a/src/mm_player_es.c b/src/mm_player_es.c
index f579d6a..b8d878a 100644 (file)
--- a/src/mm_player_es.c
+++ b/src/mm_player_es.c
@@ -873,4 +873,3 @@ _mmplayer_set_media_stream_dynamic_resolution(MMHandleType hplayer, bool drc)
 
        return ret;
 }
-

diff --git a/src/mm_player_gst.c b/src/mm_player_gst.c
index 291ff62..e3067df 100644 (file)
--- a/src/mm_player_gst.c
+++ b/src/mm_player_gst.c
@@ -719,17 +719,15 @@ if (gst_tag_list_get_string(tag_list, gsttag, &string)) {\
        if (string != NULL) { \
                SECURE_LOGD("update tag string : %s\n", string); \
                if (strlen(string) > MM_MAX_STRING_LENGTH) { \
-                       char *new_string = malloc(MM_MAX_STRING_LENGTH); \
-                       strncpy(new_string, string, MM_MAX_STRING_LENGTH-1); \
-                       new_string[MM_MAX_STRING_LENGTH-1] = '\0'; \
+                       char *new_string = g_malloc(MM_MAX_STRING_LENGTH); \
+                       strncpy(new_string, string, MM_MAX_STRING_LENGTH - 1); \
+                       new_string[MM_MAX_STRING_LENGTH - 1] = '\0'; \
                        mm_attrs_set_string_by_name(attribute, playertag, new_string); \
-                       g_free(new_string); \
-                       new_string = NULL; \
+                       MMPLAYER_FREEIF(new_string); \
                } else { \
                        mm_attrs_set_string_by_name(attribute, playertag, string); \
                } \
-               g_free(string); \
-               string = NULL; \
+               MMPLAYER_FREEIF(string); \
        } \
 }
 
@@ -767,7 +765,6 @@ do {        \
        if (gst_tag_list_get_uint(tag_list, gsttag, &v_uint)) { \
                if (v_uint) { \
                        int i = 0; \
-                       gchar *tag_list_str = NULL; \
                        MMPlayerTrackType track_type = MM_PLAYER_TRACK_TYPE_AUDIO; \
                        if (strstr(GST_OBJECT_NAME(msg->src), "audio")) \
                                track_type = MM_PLAYER_TRACK_TYPE_AUDIO; \
@@ -795,7 +792,6 @@ do {        \
                                mm_attrs_set_int_by_name(attribute, playertag, v_uint); \
                        } \
                        v_uint = 0;\
-                       g_free(tag_list_str); \
                } \
        } \
 } while (0)