frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xfree86: fix memory leaks in configLayout 

Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Nicolas Peninguy <nico@lostgeeks.org>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Tiago Vignatti 2011-03-29 19:49:32 +03:00
parent bc12331920
commit ac2fac24d8
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hw/xfree86/common/xf86Config.c
View File

@ -1485,7 +1485,7 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
{ {
XF86ConfAdjacencyPtr adjp; XF86ConfAdjacencyPtr adjp;
XF86ConfInactivePtr idp; XF86ConfInactivePtr idp;
int count = 0; int saved_count, count = 0;
int scrnum; int scrnum;
XF86ConfLayoutPtr l; XF86ConfLayoutPtr l;
MessageType from; MessageType from;
@ -1553,6 +1553,9 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
scrnum = adjp->adj_scrnum; scrnum = adjp->adj_scrnum;
if (!configScreen(slp[count].screen, adjp->adj_screen, scrnum, if (!configScreen(slp[count].screen, adjp->adj_screen, scrnum,
X_CONFIG)) { X_CONFIG)) {
do {
free(slp[count].screen);
} while(count--);
free(slp); free(slp);
return FALSE; return FALSE;
} }
@ -1641,6 +1644,10 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
} }
} }
if (!count)
saved_count = 1;
else
saved_count = count;
/* /*
* Count the number of inactive devices. * Count the number of inactive devices.
*/ */
@ -1657,16 +1664,14 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
idp = conf_layout->lay_inactive_lst; idp = conf_layout->lay_inactive_lst;
count = 0; count = 0;
while (idp) { while (idp) {
if (!configDevice(&gdp[count], idp->inactive_device, FALSE)) { if (!configDevice(&gdp[count], idp->inactive_device, FALSE))
free(gdp); goto bail;
return FALSE;
}
count++; count++;
idp = (XF86ConfInactivePtr)idp->list.next; idp = (XF86ConfInactivePtr)idp->list.next;
} }
if (!configInputDevices(conf_layout, servlayoutp)) if (!configInputDevices(conf_layout, servlayoutp))
return FALSE; goto bail;
servlayoutp->id = conf_layout->lay_identifier; servlayoutp->id = conf_layout->lay_identifier;
servlayoutp->screens = slp; servlayoutp->screens = slp;
@ -1675,6 +1680,14 @@ configLayout(serverLayoutPtr servlayoutp, XF86ConfLayoutPtr conf_layout,
from = X_DEFAULT; from = X_DEFAULT;
return TRUE; return TRUE;
bail:
do {
free(slp[saved_count].screen);
} while(saved_count--);
free(slp);
free(gdp);
return FALSE;
} }
/* /*