Fix memory leak issue

- 'new_master' is not freed if alarmmgr_init() is failed
- move alarmmgr_init() logic to above

Change-Id: I52d497dd43f3652cd3dc004c82f163603d6830d4

diff --git a/packaging/tel-plugin-packetservice.spec b/packaging/tel-plugin-packetservice.spec
index 566a720..b2b45eb 100644 (file)
--- a/packaging/tel-plugin-packetservice.spec
+++ b/packaging/tel-plugin-packetservice.spec
@@ -1,6 +1,6 @@
 %define major 0
 %define minor 3
-%define patchlevel 31
+%define patchlevel 32
 
 Name:           tel-plugin-packetservice
 Version:        %{major}.%{minor}.%{patchlevel}

diff --git a/src/ps_master.c b/src/ps_master.c
index be6c07b..c8ccdf3 100644 (file)
--- a/src/ps_master.c
+++ b/src/ps_master.c
@@ -319,6 +319,12 @@ gpointer _ps_master_create_master(GDBusConnection *conn, TcorePlugin *p)
        master = packet_service_master_skeleton_new();
        g_return_val_if_fail(master != NULL, NULL);
 
+       /*Alarm manager init*/
+       dbg("init alarm manager.");
+       if (alarmmgr_init("packetservice") != ALARMMGR_RESULT_SUCCESS) {
+               err("Failed to init alarm manager");
+               goto FAILURE;
+       }
 
        /*Initializing the master list for internal referencing*/
        new_master = g_try_malloc0(sizeof(ps_master_t));
@@ -356,12 +362,6 @@ gpointer _ps_master_create_master(GDBusConnection *conn, TcorePlugin *p)
        __ps_master_register_key_callback(new_master, KEY_WECONN_ALL_CONNECTED);
 #endif
 
-       /*Alarm manager init*/
-       dbg("init alarm manager.");
-       if (alarmmgr_init("packetservice") != ALARMMGR_RESULT_SUCCESS) {
-               err("Failed to init alarm manager");
-               goto FAILURE;
-       }
        /*Adding Hook for modem addition laters*/
        tcore_server_add_notification_hook(tcore_plugin_ref_server(p),
                TNOTI_SERVER_ADDED_MODEM_PLUGIN, __on_hook_modem_added, new_master);
@@ -374,9 +374,9 @@ gpointer _ps_master_create_master(GDBusConnection *conn, TcorePlugin *p)
        return new_master;
 
 FAILURE:
-               err("Unable to create master");
-               g_object_unref(master);
-               return NULL;
+       err("Unable to create master");
+       g_object_unref(master);
+       return NULL;
 }
 
 gboolean _ps_master_create_modems(gpointer object, TcorePlugin *modem_plg)