Fix memory leak issue found by static analyzer

Change-Id: I356c41ef7f852a4b1630ff3fd04b9ddac6b07801
Signed-off-by: Jiyong Min <jiyong.min@samsung.com>

diff --git a/packaging/libmedia-service.spec b/packaging/libmedia-service.spec
index 91f3e07..7b196b5 100644 (file)
--- a/packaging/libmedia-service.spec
+++ b/packaging/libmedia-service.spec
@@ -1,6 +1,6 @@
 Name:       libmedia-service
 Summary:    Media information service library for multimedia applications
-Version: 0.2.75
+Version: 0.2.76
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0 and public domain

diff --git a/src/common/media-svc-storage.c b/src/common/media-svc-storage.c
index cbaed52..5c9e78b 100755 (executable)
--- a/src/common/media-svc-storage.c
+++ b/src/common/media-svc-storage.c
@@ -140,18 +140,25 @@ int _media_svc_update_storage_path(sqlite3 *handle, const char *storage_id, cons
        sql = sqlite3_mprintf("UPDATE '%s' SET storage_path=%Q WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_STORAGE, path, storage_id);
        ret = _media_svc_sql_query(sql, uid);
        sqlite3_free(sql);
-       media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
+       if (ret != MS_MEDIA_ERR_NONE) {
+               G_SAFE_FREE(old_storage_path);
+               return ret;
+       }
 
        /*Folder table update*/
        sql = sqlite3_mprintf("UPDATE '%s' SET path=REPLACE(path, %Q, %Q) WHERE storage_uuid=%Q;", MEDIA_SVC_DB_TABLE_FOLDER, old_storage_path, path, storage_id);
        ret = _media_svc_sql_query(sql, uid);
        sqlite3_free(sql);
-       media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
+       if (ret != MS_MEDIA_ERR_NONE) {
+               G_SAFE_FREE(old_storage_path);
+               return ret;
+       }
 
        /*Media table update*/
        sql = sqlite3_mprintf("UPDATE '%s' SET path=REPLACE(path, %Q, %Q);", storage_id, old_storage_path, path);
        ret = _media_svc_sql_query(sql, uid);
        sqlite3_free(sql);
+       G_SAFE_FREE(old_storage_path);
        media_svc_retv_if(ret != MS_MEDIA_ERR_NONE, ret);
 
        return ret;

diff --git a/src/include/common/media-svc-util.h b/src/include/common/media-svc-util.h
index 4b7474f..1ffc7b5 100755 (executable)
--- a/src/include/common/media-svc-util.h
+++ b/src/include/common/media-svc-util.h
@@ -43,6 +43,7 @@ extern "C" {
 #endif
 
 #define SAFE_FREE(src) { if (src) {free(src); src = NULL;}}
+#define G_SAFE_FREE(src)       { if (src) {g_free(src); src = NULL;}}
 #define STRING_VALID(str)      \
        ((str != NULL && strlen(str) > 0) ? TRUE : FALSE)