raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=92e8935fa637ae2f3cfa185589b298de4cee235a
commit 92e8935fa637ae2f3cfa185589b298de4cee235a
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Thu Sep 28 13:58:08 2017 +0900
ecore evas - wayland - avoid divide by 0 if height is 0
fixes CID 1379247
---
.../engines/wayland/ecore_evas_wayland_common.c | 60 ++++++++++++----------
1 file changed, 32 insertions(+), 28 deletions(-)
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 6c806765f1..b5f7695c6d 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -316,41 +316,45 @@ _ecore_evas_wl_common_resize(Ecore_Evas *ee, int w, int h)
/* copied from e_client.c */
Evas_Aspect_Control aspect;
int aw, ah;
- double val, a = (double)w / h;
+ double val, a;
- if (fabs(a - ee->prop.aspect) > 0.001)
+ if (h > 0)
{
- int step_w = ee->prop.step.w ?: 1, step_h =
ee->prop.step.h ?: 1;
- if (wdata->resizing || wdata->win->resizing)
- ew = wdata->cw, eh = wdata->ch;
- if (abs(w - ew) > abs(h - eh))
- aspect = EVAS_ASPECT_CONTROL_HORIZONTAL;
- else
- aspect = EVAS_ASPECT_CONTROL_VERTICAL;
- switch (aspect)
+ a = (double)w / (double)h;
+ if (fabs(a - ee->prop.aspect) > 0.001)
{
- case EVAS_ASPECT_CONTROL_HORIZONTAL:
- val = ((h - (w / ee->prop.aspect)) * step_h) /
step_h;
- if (val > 0)
- ah = ceil(val);
+ int step_w = ee->prop.step.w ?: 1;
+ int step_h = ee->prop.step.h ?: 1;
+
+ if (wdata->resizing || wdata->win->resizing)
+ ew = wdata->cw, eh = wdata->ch;
+ if (abs(w - ew) > abs(h - eh))
+ aspect = EVAS_ASPECT_CONTROL_HORIZONTAL;
else
- ah = floor(val);
- if ((h - ah > minh) || (minh < 1))
+ aspect = EVAS_ASPECT_CONTROL_VERTICAL;
+ switch (aspect)
{
- h -= ah;
+ case EVAS_ASPECT_CONTROL_HORIZONTAL:
+ val = ((h - (w / ee->prop.aspect)) *
+ step_h) / step_h;
+ if (val > 0) ah = ceil(val);
+ else ah = floor(val);
+ if ((h - ah > minh) || (minh < 1))
+ {
+ h -= ah;
+ break;
+ }
+ EINA_FALLTHROUGH;
+ /* no break */
+ default:
+ val = (((h * ee->prop.aspect) - w) *
+ step_w) / step_w;
+ if (val > 0) aw = ceil(val);
+ else aw = floor(val);
+ if ((w + aw < maxw) || (maxw < 1))
+ w += aw;
break;
}
- EINA_FALLTHROUGH;
- /* no break */
- default:
- val = (((h * ee->prop.aspect) - w) * step_w) /
step_w;
- if (val > 0)
- aw = ceil(val);
- else
- aw = floor(val);
- if ((w + aw < maxw) || (maxw < 1))
- w += aw;
- break;
}
}
}
--
