[0.2.95] Change memory allocation fuction malloc() to g_try_new0()

Change-Id: I6c082d8bdbd78c70b27ec16fc7db0235d4a1a560

diff --git a/legacy/src/legacy_player.c b/legacy/src/legacy_player.c
index b83ab76..8627411 100644 (file)
--- a/legacy/src/legacy_player.c
+++ b/legacy/src/legacy_player.c
@@ -592,10 +592,8 @@ int legacy_player_create(player_h *player)
        PLAYER_INSTANCE_CHECK(player);
        PLAYER_TRACE_BEGIN("MM:PLAYER:CREATE");
        player_s *handle;
-       handle = (player_s *)malloc(sizeof(player_s));
-       if (handle != NULL)
-               memset(handle, 0, sizeof(player_s));
-       else {
+       handle = g_try_new0(player_s, 1);
+       if (!handle) {
                LOGE("[%s] PLAYER_ERROR_OUT_OF_MEMORY(0x%08x)", __FUNCTION__, PLAYER_ERROR_OUT_OF_MEMORY);
                return PLAYER_ERROR_OUT_OF_MEMORY;
        }
@@ -603,7 +601,7 @@ int legacy_player_create(player_h *player)
        if (ret != MM_ERROR_NONE) {
                LOGE("[%s] PLAYER_ERROR_INVALID_OPERATION(0x%08x)", __FUNCTION__, PLAYER_ERROR_INVALID_OPERATION);
                __player_update_state(handle, PLAYER_INTERNAL_STATE_NONE);
-               free(handle);
+               g_free(handle);
                handle = NULL;
                return __player_convert_error_code(ret, (char *)__FUNCTION__);
        } else {
@@ -687,7 +685,7 @@ int legacy_player_destroy(player_h player)
                g_mutex_clear(&handle->message_queue_lock);
                g_cond_clear(&handle->message_queue_cond);
 
-               free(handle);
+               g_free(handle);
                handle = NULL;
                LOGI("[%s] End", __FUNCTION__);
                PLAYER_TRACE_END();

diff --git a/muse/src/muse_player.c b/muse/src/muse_player.c
index 858e274..1099abf 100644 (file)
--- a/muse/src/muse_player.c
+++ b/muse/src/muse_player.c
@@ -91,7 +91,7 @@ static bool _create_export_data(muse_player_handle_s *muse_player, void *data, i
                return FALSE;
        }
 
-       export_data = g_new0(muse_player_export_data_s, 1);
+       export_data = g_try_new0(muse_player_export_data_s, 1);
        if (export_data == NULL) {
                LOGE("failed to alloc export_data");
                return FALSE;
@@ -1325,14 +1325,13 @@ int player_disp_create(muse_module_h module)
        player_msg_get(pid, muse_server_module_get_msg(module));
 
        /* init handle */
-       muse_player = (muse_player_handle_s *)malloc(sizeof(muse_player_handle_s));
-       if (muse_player == NULL) {
+       muse_player = g_try_new0(muse_player_handle_s, 1);
+       if (!muse_player) {
                ret = PLAYER_ERROR_OUT_OF_MEMORY;
                LOGE("failed to alloc handle 0x%x", ret);
                PLAYER_RETURN_MSG(api, ret, module);
                return ret;
        }
-       memset(muse_player, 0x0, sizeof(muse_player_handle_s));
 
        /* get buffer mgr */
        if (muse_server_ipc_get_bufmgr(&muse_player->bufmgr) != MM_ERROR_NONE) {
@@ -1360,7 +1359,7 @@ int player_disp_create(muse_module_h module)
 ERROR:
        legacy_player_destroy(muse_player->player_handle);
 
-       free(muse_player);
+       g_free(muse_player);
        muse_player = NULL;
        PLAYER_RETURN_MSG(api, ret, module);
        return ret;
@@ -1393,7 +1392,7 @@ int player_disp_destroy(muse_module_h module)
 
        muse_player->bufmgr = NULL;
 
-       free(muse_player);
+       g_free(muse_player);
        muse_player = NULL;
 
        PLAYER_RETURN_MSG(api, ret, module);
@@ -1440,7 +1439,7 @@ int player_disp_prepare_async(muse_module_h module)
 
        muse_player = (muse_player_handle_s *)muse_server_ipc_get_handle(module);
 
-       prepare_data = g_new(prepare_data_s, 1);
+       prepare_data = g_try_new(prepare_data_s, 1);
        if (!prepare_data) {
                ret = PLAYER_ERROR_INVALID_OPERATION;
                goto ERROR;

diff --git a/packaging/mmsvc-player.spec b/packaging/mmsvc-player.spec
index 5df9c50..df462fa 100644 (file)
--- a/packaging/mmsvc-player.spec
+++ b/packaging/mmsvc-player.spec
@@ -1,6 +1,6 @@
 Name:       mmsvc-player
 Summary:    A Media Player module for muse server
-Version:    0.2.94
+Version:    0.2.95
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0