Fix memory leak

-After call g_variant_get function with string format,
should call free.

Change-Id: I6d2f74e4aaf920030ae3b691ea6705fb6f8623cf
Signed-off-by: Yunmi Ha <yunmi.ha@samsung.com>

diff --git a/src/storage-external-dbus.c b/src/storage-external-dbus.c
index 5d4518935ffa4fdb7ffae93347281f86f0f637bb..731296a7ffe8b746b074b56451699d082578afd7 100755 (executable)
--- a/src/storage-external-dbus.c
+++ b/src/storage-external-dbus.c
@@ -395,6 +395,8 @@ int storage_ext_get_storage_level(const char *path, char **level)
 
        g_variant_get(result, "(s)", &tmp);
        *level = strdup(tmp);
+       g_free(tmp);
+
        if (*level == NULL)
                return -ENOMEM;
 

diff --git a/src/storage-inhouse.c b/src/storage-inhouse.c
index 2ec6f08dbfef2c40637212578c083f40be135171..b35c4fbabc40bb21eca3cc134f4765b4ae927cb8 100755 (executable)
--- a/src/storage-inhouse.c
+++ b/src/storage-inhouse.c
@@ -164,7 +164,9 @@ API int storage_get_origin_internal_path(const char* compat, int len, char* orig
 API int storage_get_primary_sdcard(int *storage_id, char **path)
 {
        GVariant *result;
-       storage_ext_device info;
+       int ret;
+       char *mount_point = NULL;
+       int id;
 
        if (!storage_id || !path)
                return STORAGE_ERROR_INVALID_PARAMETER;
@@ -185,25 +187,33 @@ API int storage_get_primary_sdcard(int *storage_id, char **path)
        }
 
        g_variant_get(result, "(issssssisibii)",
-                       &info.type, &info.devnode, &info.syspath,
-                       &info.fs_usage, &info.fs_type,
-                       &info.fs_version, &info.fs_uuid,
-                       &info.readonly, &info.mount_point,
-                       &info.state, &info.primary,
-                       &info.flags, &info.storage_id);
+                       NULL, NULL, NULL,
+                       NULL, NULL,
+                       NULL, NULL,
+                       NULL, &mount_point,
+                       NULL, NULL,
+                       NULL, &id);
 
        g_variant_unref(result);
 
-       if (info.storage_id < 0)
-               return STORAGE_ERROR_NO_DEVICE;
+       if (id < 0) {
+               ret = STORAGE_ERROR_NO_DEVICE;
+               goto out;
+       }
 
-       *path = strdup(info.mount_point);
-       if (*path == NULL)
-               return STORAGE_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE System Error
+       *path = strdup(mount_point);
+       if (*path == NULL) {
+               ret = STORAGE_ERROR_OUT_OF_MEMORY; //LCOV_EXCL_LINE System Error
+               goto out;
+       }
 
-       *storage_id = info.storage_id;
+       *storage_id = id;
 
-       return STORAGE_ERROR_NONE;
+       ret = STORAGE_ERROR_NONE;
+out:
+       g_free(mount_point);
+
+       return ret;
 }
 
 API int storage_get_storage_level(const char *path, char **level)