Fix syspopup data free 49/71649/3
authorseolhee, kim <s414.kim@samsung.com>
Thu, 26 May 2016 09:55:10 +0000 (18:55 +0900)
committerSungbae Yoo <sungbae.yoo@samsung.com>
Fri, 27 May 2016 05:45:19 +0000 (22:45 -0700)
Change-Id: I6077dfb5a7365b6c1b0fe8b1db374e2e08461510
Signed-off-by: seolhee, kim <s414.kim@samsung.com>
tools/syspopup/src/main.c

index ff90922..f4eaa12 100644 (file)
@@ -82,7 +82,6 @@ static void __app_control(app_control_h app_control, void *data)
        ret = app_control_get_extra_data(app_control, "id", &bundle_data.id);
        if (ret != APP_CONTROL_ERROR_NONE) {
                dlog_print(DLOG_ERROR, LOG_TAG, "failed to get popup id");
-               __free_data();
                ui_app_exit();
        }
 
@@ -91,7 +90,6 @@ static void __app_control(app_control_h app_control, void *data)
                bundle_data.style = NULL;
        } else if (ret != APP_CONTROL_ERROR_NONE) {
                dlog_print(DLOG_ERROR, LOG_TAG, "failed to get popup style");
-               __free_data();
                ui_app_exit();
        }
 
@@ -100,39 +98,35 @@ static void __app_control(app_control_h app_control, void *data)
                bundle_data.status = strdup(DPM_SYSPOPUP_DEFAULT_STATUS);
        } else if (ret != APP_CONTROL_ERROR_NONE) {
                dlog_print(DLOG_ERROR, LOG_TAG, "failed to get popup status");
-               __free_data();
                ui_app_exit();
        }
 
        ret = app_control_get_extra_data_array(app_control, "user-data", &bundle_data.user_data, &bundle_data.data_size);
        if (ret != APP_CONTROL_ERROR_KEY_NOT_FOUND && ret != APP_CONTROL_ERROR_NONE) {
                dlog_print(DLOG_ERROR, LOG_TAG, "failed to get popup user data");
-               __free_data();
                ui_app_exit();
        }
 
        ret = app_control_create(&svc);
        if (ret != APP_CONTROL_ERROR_NONE) {
                dlog_print(DLOG_ERROR, LOG_TAG, "failed to create app_control handler");
-               __free_data();
                ui_app_exit();
        }
 
        if (__create_app_control(svc) != 0) {
                dlog_print(DLOG_ERROR, LOG_TAG, "failed to set app_control handler");
                app_control_destroy(svc);
-               __free_data();
                ui_app_exit();
        }
 
        _create_syspopup(bundle_data.id, bundle_data.style, bundle_data.status, svc);
 
-       __free_data();
        return;
 }
 
 static void __app_terminate(void *data)
 {
+       __free_data();
        return;
 }