e_blur: fix unreachable code and leaked storage issue

also fixed buffer size warning in e_info_client

Change-Id: I63ef998f901ae5a9ebeb398fc62e549ff2ab7c0b

diff --git a/src/bin/debug/e_info_client.c b/src/bin/debug/e_info_client.c
index f0ed548238a9ca2b74d4b1200d1e9429f7b58210..31ce8b5621c3948b7a669a8567c73b24d2afd5d1 100644 (file)
--- a/src/bin/debug/e_info_client.c
+++ b/src/bin/debug/e_info_client.c
@@ -6658,7 +6658,7 @@ _e_info_client_proc_edit_blur_option(int argc, char **argv)
                   printf("Too long argument: %s\n\n", argv[idx]);
                   return;
                }
-             strncpy(msg_args[idx-4], argv[idx], sizeof(msg_args[idx-4]));
+             strncpy(msg_args[idx-4], argv[idx], sizeof(msg_args[idx-4])-1);
           }
         res = _e_info_client_eldbus_message_with_args("blur_option",
                                                       _e_info_client_cb_blur_option,

diff --git a/src/bin/server/e_blur.c b/src/bin/server/e_blur.c
index ba99bbb6f6f3682036378779bcf92be4b5c377e0..fb58dd1cd68ac81376970497e8b199e307c76075 100644 (file)
--- a/src/bin/server/e_blur.c
+++ b/src/bin/server/e_blur.c
@@ -791,7 +791,6 @@ _e_blur_cb_new_rectangle(struct wl_listener *listener, void *data)
 fail:
    if (dim_view) _e_blur_rectangle_dim_rect_free(blur_rectangle);
    if (img_view) _e_blur_rectangle_view_image_free(blur_rectangle);
-   if (corner_img_view) _e_blur_rectangle_corner_radius_image_free(blur_rectangle);
    if (blur_rectangle) free(blur_rectangle);
 }
 
@@ -1129,7 +1128,7 @@ _e_blur_manager_cb_new_blur_behind(struct wl_listener *listener, void *data)
    blur_behind = E_NEW(E_Blur_Behind, 1);
    EINA_SAFETY_ON_NULL_RETURN(blur_behind);
    blur_rectangle = E_NEW(E_Blur_Rectangle, 1);
-   EINA_SAFETY_ON_NULL_RETURN(blur_rectangle);
+   EINA_SAFETY_ON_NULL_GOTO(blur_rectangle, fail);
 
    blur_behind->listener.destroy.notify = _e_blur_behind_cb_ds_tizen_blur_behind_destroy;
    ds_tizen_blur_behind_add_destroy_listener(tizen_blur_behind, &blur_behind->listener.destroy);