Apply correct memory release function

Change-Id: Ibce6ef8f1420a14fe9fae45fdb09ab0627607343
Signed-off-by: Hyunil <hyunil46.park@samsung.com>

diff --git a/src/media_streamer_gst.c b/src/media_streamer_gst.c
index 0007ffb280dde115406b6bd8bc195397ecead320..f6ad6249d54b4004db6541e4f71511803d431220 100644 (file)
--- a/src/media_streamer_gst.c
+++ b/src/media_streamer_gst.c
@@ -2094,7 +2094,7 @@ static gboolean __ms_bus_cb(GstBus *bus, GstMessage *message, gpointer userdata)
                                ms_error("[Source: %s] Error: %s", GST_OBJECT_NAME(GST_OBJECT_CAST(GST_ELEMENT(GST_MESSAGE_SRC(message)))), err->message);
 
                                g_error_free(err);
-                               MS_SAFE_FREE(debug);
+                               MS_SAFE_GFREE(debug);
                                break;
                        }
 
@@ -2222,7 +2222,7 @@ static int __ms_gstreamer_init(media_streamer_s *ms_streamer)
        for (i = 1; i < *argc; i++)
                argv[i] = NULL;
 
-       MS_SAFE_GFREE(argv[0]);
+       MS_SAFE_FREE(argv[0]);
        MS_SAFE_FREE(argv);
        MS_SAFE_FREE(argc);
 

diff --git a/src/media_streamer_http_server.c b/src/media_streamer_http_server.c
index 7f1bb088e474983edf63cd02c2c808737b9e2d8d..f8f6f6e32f41ccbe358bfe4a30406807578bc31d 100644 (file)
--- a/src/media_streamer_http_server.c
+++ b/src/media_streamer_http_server.c
@@ -99,7 +99,7 @@ int __ms_http_server_destroy(media_streamer_http_server_h server)
        if (hserver->server)
                g_object_unref(hserver->server);
 
-       MS_SAFE_GFREE(hserver);
+       MS_SAFE_FREE(hserver);
 
        ms_debug_fleave();
 

diff --git a/src/media_streamer_node.c b/src/media_streamer_node.c
index e7e78e8f02c4bfd50a815cde0e4691b8e2ad3a1b..49a047c0db882d6dd45cb6b94b844502f8394ce6 100644 (file)
--- a/src/media_streamer_node.c
+++ b/src/media_streamer_node.c
@@ -1005,7 +1005,7 @@ static gboolean demux_find(gpointer key, gpointer value, gpointer user_data)
 static int __ms_adaptive_sink_http_server_prepare(media_streamer_s * ms_streamer, media_streamer_node_s *node)
 {
        int err_code = MEDIA_STREAMER_ERROR_NONE;
-       char *playlist_location = NULL;
+       gchar *playlist_location = NULL;
        char *playlist_dir = NULL;
        char *split = NULL;
 

diff --git a/src/media_streamer_util.c b/src/media_streamer_util.c
index 3ad8754b0ac92f39cd8f5171186d14fe95c22e7b..7b62507f2b1390ea4e0926d17bcc039badaf2b20 100644 (file)
--- a/src/media_streamer_util.c
+++ b/src/media_streamer_util.c
@@ -153,7 +153,7 @@ void __ms_ini_read_list(const char *key, gchar ***list)
                g_strstrip(strtmp);
 
                *list = g_strsplit(strtmp, ",", 10);
-               MS_SAFE_FREE(strtmp);
+               MS_SAFE_GFREE(strtmp);
        }
 
        ms_debug_fleave();