andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xf86AutoConfig: make copyScreen memory allocation & error handling more sane

Browse Source 
No point calling the no-fail-alloc if you check for failure and your
only caller checks for failure.

No point calling calloc to zero fill memory you're about to memcpy over.

In the unlikely event of a loss of memory allocation, drop your previous
allocations before returning to others.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net>
This commit is contained in:
Alan Coopersmith 2010-11-27 19:06:56 -08:00
parent 2c8e534c8e
commit 4bbc90cd8b
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/xfree86/common/xf86AutoConfig.c
View File

@ -282,21 +282,31 @@ listPossibleVideoDrivers(char *matches[], int nmatches)
static Bool
copyScreen(confScreenPtr oscreen, GDevPtr odev, int i, char *driver)
{
confScreenPtr nscreen;
GDevPtr cptr = NULL;
xf86ConfigLayout.screens[i].screen = xnfcalloc(1, sizeof(confScreenRec));
if(!xf86ConfigLayout.screens[i].screen)
nscreen = malloc(sizeof(confScreenRec));
if (!nscreen)
return FALSE;
memcpy(xf86ConfigLayout.screens[i].screen, oscreen, sizeof(confScreenRec));
memcpy(nscreen, oscreen, sizeof(confScreenRec));
cptr = calloc(1, sizeof(GDevRec));
if (!cptr)
cptr = malloc(sizeof(GDevRec));
if (!cptr) {
free(nscreen);
return FALSE;
}
memcpy(cptr, odev, sizeof(GDevRec));
cptr->identifier = Xprintf("Autoconfigured Video Device %s", driver);
if (!cptr->identifier) {
free(cptr);
free(nscreen);
return FALSE;
}
cptr->driver = driver;
xf86ConfigLayout.screens[i].screen = nscreen;
/* now associate the new driver entry with the new screen entry */
xf86ConfigLayout.screens[i].screen->device = cptr;
cptr->myScreenSection = xf86ConfigLayout.screens[i].screen;