Fix error return 30/230630/3
authorSukHyung, Kang <shine.kang@samsung.com>
Mon, 13 Apr 2020 05:42:03 +0000 (14:42 +0900)
committerSukHyung, Kang <shine.kang@samsung.com>
Tue, 14 Apr 2020 01:48:03 +0000 (10:48 +0900)
Change-Id: I62779efdb4bb7c503d6000551c8e05b005f3c6f7
Signed-off-by: SukHyung, Kang <shine.kang@samsung.com>
src/widget_service.c

index e8e6bf8..daee59b 100644 (file)
@@ -2866,7 +2866,7 @@ EAPI int widget_service_get_widget_disabled(const char *widget_id,
                return WIDGET_ERROR_NOT_SUPPORTED;
        }
 
-       if (widget_id == NULL) {
+       if (widget_id == NULL || is_disabled == NULL) {
                _E("Invalid parameter");
                return WIDGET_ERROR_INVALID_PARAMETER;
        }
@@ -2933,8 +2933,6 @@ EAPI int widget_service_set_disable_event_cb(widget_disable_event_cb callback,
 
 EAPI int widget_service_unset_disable_event_cb(void)
 {
-       int ret = WIDGET_ERROR_NONE;
-
        if (!_is_widget_feature_enabled()) {
                _E("not supported");
                return WIDGET_ERROR_NOT_SUPPORTED;
@@ -2944,19 +2942,18 @@ EAPI int widget_service_unset_disable_event_cb(void)
                return WIDGET_ERROR_PERMISSION_DENIED;
 
        if (_conn) {
-               if (aul_app_com_leave(_conn) < 0)
+               if (aul_app_com_leave(_conn) < 0) {
                        _E("failed to leave app com disable");
+                       return WIDGET_ERROR_IO_ERROR;
+               }
                _conn = NULL;
-               ret = WIDGET_ERROR_IO_ERROR;
-               goto out;
        }
 
-out:
        if (_disable_event_cb)
                _disable_event_cb = NULL;
 
        if (_disable_user_data)
                _disable_user_data = NULL;
 
-       return ret;
+       return WIDGET_ERROR_NONE;
 }