From 87d33bb538572c6c5f4912427a06fd525a48f846 Mon Sep 17 00:00:00 2001 From: "jinbong.lee" Date: Wed, 7 Aug 2024 19:06:29 +0900 Subject: [PATCH] Revert "e_client: fix segfault when the w or h is NULL" This reverts commit c7d905895263ab110d3cd058e6a461e6824b51ec. Change-Id: I8b7db97dafb672632e7140375e21579539e1ae43 --- src/bin/core/e_client.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/bin/core/e_client.c b/src/bin/core/e_client.c index ac201f7..841e18f 100644 --- a/src/bin/core/e_client.c +++ b/src/bin/core/e_client.c @@ -3826,7 +3826,6 @@ e_client_size_get(E_Client *ec, int *w, int *h) E_API void e_client_geometry_get(E_Client *ec, int *x, int *y, int *w, int *h) { - int vx, vy, vw, vh; E_OBJECT_CHECK(ec); E_OBJECT_TYPE_CHECK(ec, E_CLIENT_TYPE); @@ -3842,15 +3841,9 @@ e_client_geometry_get(E_Client *ec, int *x, int *y, int *w, int *h) } else if (view_client) { - e_view_client_geometry_get(view_client, &vx, &vy, &vw, &vh); - if (vw != 0 || vh != 0) - { - if (x) *x = vx; - if (y) *y = vy; - if (w) *w = vw; - if (h) *h = vh; - return; - } + e_view_client_geometry_get(view_client, x, y, w, h); + if (*w != 0 || *h != 0) + return; /* In this case (w == 0 && h == 0), there is no image buffer in e_comp_object, thus it * should return geometry value of ec itself. It usually happens if -- 2.7.4