e_blur: fix null pointer exception issue

Change-Id: I6c7ea6c73a1d05d0dff3f2e89ebcb2badea8a0a5

diff --git a/src/bin/server/e_blur.c b/src/bin/server/e_blur.c
index c237ca2f00aba872171832da4cff17d238d3cfc0..e5c1094e8ab6d3774af683e453e6adcd21b6fd96 100644 (file)
--- a/src/bin/server/e_blur.c
+++ b/src/bin/server/e_blur.c
@@ -628,9 +628,9 @@ _e_blur_rectangle_view_image_new(E_Blur_Rectangle *blur_rectangle, E_View_Tree *
 static void
 _e_blur_rectangle_view_image_free(E_Blur_Rectangle *blur_rectangle)
 {
-   if (blur_rectangle && blur_rectangle->view_image)
-     e_view_destroy(e_view_image_view_get(blur_rectangle->view_image));
-
+   EINA_SAFETY_ON_NULL_RETURN(blur_rectangle);
+   EINA_SAFETY_ON_NULL_RETURN(blur_rectangle->view_image);
+   e_view_destroy(e_view_image_view_get(blur_rectangle->view_image));
    blur_rectangle->view_image = NULL;
 }
 
@@ -661,9 +661,9 @@ _e_blur_rectangle_dim_rect_new(E_Blur_Rectangle *blur_rectangle, E_View_Tree *vi
 static void
 _e_blur_rectangle_dim_rect_free(E_Blur_Rectangle *blur_rectangle)
 {
-   if (blur_rectangle && blur_rectangle->dim_rect)
-     e_view_destroy(e_view_rect_view_get(blur_rectangle->dim_rect));
-
+   EINA_SAFETY_ON_NULL_RETURN(blur_rectangle);
+   EINA_SAFETY_ON_NULL_RETURN(blur_rectangle->dim_rect);
+   e_view_destroy(e_view_rect_view_get(blur_rectangle->dim_rect));
    blur_rectangle->dim_rect = NULL;
 }
 
@@ -699,9 +699,9 @@ _e_blur_rectangle_corner_radius_image_new(E_Blur_Rectangle *blur_rectangle, E_Vi
 static void
 _e_blur_rectangle_corner_radius_image_free(E_Blur_Rectangle *blur_rectangle)
 {
-   if (blur_rectangle && blur_rectangle->corner_radius_image)
-     e_view_destroy(e_view_image_view_get(blur_rectangle->corner_radius_image));
-
+   EINA_SAFETY_ON_NULL_RETURN(blur_rectangle);
+   EINA_SAFETY_ON_NULL_RETURN(blur_rectangle->corner_radius_image);
+   e_view_destroy(e_view_image_view_get(blur_rectangle->corner_radius_image));
    blur_rectangle->corner_radius_image = NULL;
 }