Fix memory leak and usage of json api

Change-Id: Iaf9a770ffd473a27f372269f1d83c9275308cf26
Signed-off-by: jinwang.an <jinwang.an@samsung.com>

diff --git a/src/system_setting_platform.c b/src/system_setting_platform.c
index ddbb45b..4a1f52f 100644 (file)
--- a/src/system_setting_platform.c
+++ b/src/system_setting_platform.c
@@ -2366,6 +2366,7 @@ int system_setting_get_uds_state(system_settings_key_e key, void **value)
                                        result = package_manager_get_package_id_by_app_id(app_id, &package_id);
                                        if (result != PACKAGE_MANAGER_ERROR_NONE) {
                                                SETTING_TRACE("package_manager_get_package_id_by_app_id returned error! %d", result);
+                                               free(app_id);
                                                free(vconf_string_value);
                                                return SYSTEM_SETTINGS_ERROR_IO_ERROR;
                                        }

diff --git a/src/system_settings_json.c b/src/system_settings_json.c
index 379db67..c37e8d2 100644 (file)
--- a/src/system_settings_json.c
+++ b/src/system_settings_json.c
@@ -13,7 +13,7 @@ static void ss_json_ringtone_save(JsonNode *root)
        // write here
        JsonGenerator *generator = json_generator_new();
        json_generator_set_root(generator, root);
-       g_object_set(generator, "pretty", TRUE, NULL);
+       json_generator_set_pretty(generator, TRUE);
 #ifdef USE_JSONFILE
        GError *error = NULL;
        gboolean ret = json_generator_to_file(generator, filename, &error);
@@ -89,8 +89,8 @@ void ss_json_ringtone_print(JsonNode *root)
        JsonNode *node = root;
 
        JsonGenerator *generator = json_generator_new();
-       g_object_set(generator, "pretty", TRUE, NULL);
        json_generator_set_root(generator, node);
+       json_generator_set_pretty(generator, TRUE);
        gchar *data = json_generator_to_data(generator, NULL);
        //SETTING_TRACE("%s", (char * )data);
        SETTING_TRACE("-------------------------------------------------------\n");

diff --git a/system-settings-util/src/system_settings_util.c b/system-settings-util/src/system_settings_util.c
index 93067b2..2a43651 100644 (file)
--- a/system-settings-util/src/system_settings_util.c
+++ b/system-settings-util/src/system_settings_util.c
@@ -430,7 +430,7 @@ void __font_size_set()
        eext_libs.d_eext_config_font_set(font_name, font_size);
 
        DYM_CLOSE_HANDLE(d_efl_eext_handle);
-       g_free(font_name);
+       free(font_name);
 }
 /*  LCOV_EXCL_STOP */