enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

ecore-x: fix randr query when noutputs is 0.

This commit is contained in:
Carsten Haitzler 2013-07-24 19:22:31 +09:00
parent a48c4cd064
commit e945f0d196
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/lib/ecore_x/xcb/ecore_xcb_randr.c
View File

@ -2672,15 +2672,19 @@ ecore_x_randr_window_outputs_get(Ecore_X_Window window,
outputs = ecore_x_randr_crtc_outputs_get(root, crtcs[i],
&noutputs);
if (!outputs)
goto _ecore_x_randr_current_output_get_fail_free;
tret = realloc(ret, ((nret + noutputs) * sizeof(Ecore_X_Randr_Output)));
if (!tret) goto _ecore_x_randr_current_output_get_fail_free;
ret = tret;
memcpy(&ret[nret], outputs, (noutputs * sizeof(Ecore_X_Randr_Output)));
nret += noutputs;
free(outputs);
outputs = NULL;
if (outputs)
{
if (noutputs > 0)
{
tret = realloc(ret, ((nret + noutputs) * sizeof(Ecore_X_Randr_Output)));
if (!tret) goto _ecore_x_randr_current_output_get_fail_free;
ret = tret;
memcpy(&ret[nret], outputs, (noutputs * sizeof(Ecore_X_Randr_Output)));
nret += noutputs;
}
free(outputs);
outputs = NULL;
}
}
free(crtcs);

20
src/lib/ecore_x/xlib/ecore_x_randr.c
View File

@ -1034,17 +1034,19 @@ ecore_x_randr_window_outputs_get(Ecore_X_Window window, int *num)
/* try to get the crtc info for this crtc */
if (!(crtc = XRRGetCrtcInfo(_ecore_x_disp, res, crtcs[i])))
continue;
/* try to reallocate our return variable */
if ((tret = realloc(ret, ((nret + crtc->noutput) *
sizeof(Ecore_X_Randr_Output)))))
if (crtc->noutput > 0)
{
ret = tret;
memcpy(&ret[nret], crtc->outputs,
(crtc->noutput * sizeof(Ecore_X_Randr_Output)));
nret += crtc->noutput;
/* try to reallocate our return variable */
if ((tret = realloc(ret, ((nret + crtc->noutput) *
sizeof(Ecore_X_Randr_Output)))))
{
ret = tret;
memcpy(&ret[nret], crtc->outputs,
(crtc->noutput * sizeof(Ecore_X_Randr_Output)));
nret += crtc->noutput;
}
}
/* free the crtc info */
XRRFreeCrtcInfo(crtc);
}