enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

ecore evas - wayland - avoid divide by 0 if height is 0 

fixes CID 1379247
This commit is contained in:
Carsten Haitzler 2017-09-28 13:58:08 +09:00
parent dea4e5aa46
commit 92e8935fa6
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
View File

@ -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;
}
}
}