vtorri
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix possible ptr deref bug waiting to happen if crtc_info is null. 

SVN revision: 56091
This commit is contained in:
Carsten Haitzler 2011-01-14 05:47:38 +00:00
parent 2ea38f3b4a
commit 267968f64a
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
legacy/ecore/src/lib/ecore_x/xlib/ecore_x_randr_12.c
View File

@ -1750,10 +1750,12 @@ ecore_x_randr_move_crtcs(Ecore_X_Window root,
#ifdef ECORE_XRANDR #ifdef ECORE_XRANDR
RANDR_CHECK_1_2_RET(EINA_FALSE); RANDR_CHECK_1_2_RET(EINA_FALSE);
XRRScreenResources *res = NULL; XRRScreenResources *res = NULL;
XRRCrtcInfo *crtc_info[ncrtc]; XRRCrtcInfo **crtc_info = NULL;
Eina_Bool ret = EINA_TRUE; Eina_Bool ret = EINA_TRUE;
int i, cw, ch, w_max, h_max, nw, nh; int i, cw, ch, w_max, h_max, nw, nh;
crtc_info = alloca(sizeof(XRRCrtcInfo *) * ncrtc);
memset(crtc_info, 0, sizeof(XRRCrtcInfo *) * ncrtc);
if (_ecore_x_randr_root_validate(root) if (_ecore_x_randr_root_validate(root)
&& (res = _ecore_x_randr_get_screen_resources (_ecore_x_disp, root))) && (res = _ecore_x_randr_get_screen_resources (_ecore_x_disp, root)))
{ {
@ -1790,12 +1792,13 @@ ecore_x_randr_move_crtcs(Ecore_X_Window root,
//actually move all the crtcs, keep their rotation and mode. //actually move all the crtcs, keep their rotation and mode.
for (i = 0; (i < ncrtc) && crtc_info[i]; i++) for (i = 0; (i < ncrtc) && crtc_info[i]; i++)
{ {
if (!ecore_x_randr_crtc_settings_set(root, crtcs[i], NULL, if ((crtc_info[i]) &&
Ecore_X_Randr_Unset, (!ecore_x_randr_crtc_settings_set(root, crtcs[i], NULL,
(crtc_info[i]->x + dx), Ecore_X_Randr_Unset,
(crtc_info[i]->y + dy), (crtc_info[i]->x + dx),
crtc_info[i]->mode, (crtc_info[i]->y + dy),
crtc_info[i]->rotation)) crtc_info[i]->mode,
crtc_info[i]->rotation)))
{ {
ret = EINA_FALSE; ret = EINA_FALSE;
break; break;
@ -1805,20 +1808,23 @@ ecore_x_randr_move_crtcs(Ecore_X_Window root,
{ {
//something went wrong, let's try to move the already moved crtcs //something went wrong, let's try to move the already moved crtcs
//back. //back.
while (((i--) >= 0)) while ((i--) >= 0)
ecore_x_randr_crtc_settings_set(root, {
crtcs[i], if (crtc_info[i])
NULL, ecore_x_randr_crtc_settings_set(root,
Ecore_X_Randr_Unset, crtcs[i],
(crtc_info[i]->x - dx), NULL,
(crtc_info[i]->y - dy), Ecore_X_Randr_Unset,
crtc_info[i]->mode, (crtc_info[i]->x - dx),
crtc_info[i]->rotation); (crtc_info[i]->y - dy),
crtc_info[i]->mode,
crtc_info[i]->rotation);
}
} }
for (i = 0; i < ncrtc; i++) for (i = 0; i < ncrtc; i++)
{ {
XRRFreeCrtcInfo(crtc_info[i]); if (crtc_info[i]) XRRFreeCrtcInfo(crtc_info[i]);
} }
} }