SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xext: don't free uninitialised pointer when malloc fails. (v2)

Browse Source 
Initialise the pAttr->values to values so if the values allocation
fails it just ends up as free(NULL).

Pointed out by coverity.

v2: use Alan's suggestion.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
(cherry picked from commit b62dc4fcbc)
This commit is contained in:
Dave Airlie
2011-10-19 16:21:26 +01:00
committed by Jeremy Huddleston
parent 083599c559
commit b22783f483
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Xext/saver.c
View File

@@ -927,7 +927,7 @@ ScreenSaverSetAttributes (ClientPtr client)
goto bail; goto bail;
} }
/* over allocate for override redirect */ /* over allocate for override redirect */
values = malloc((len + 1) * sizeof (unsigned long)); pAttr->values = values = malloc((len + 1) * sizeof (unsigned long));
if (!values) if (!values)
{ {
ret = BadAlloc; ret = BadAlloc;
@@ -947,7 +947,6 @@ ScreenSaverSetAttributes (ClientPtr client)
pAttr->pCursor = NullCursor; pAttr->pCursor = NullCursor;
pAttr->pBackgroundPixmap = NullPixmap; pAttr->pBackgroundPixmap = NullPixmap;
pAttr->pBorderPixmap = NullPixmap; pAttr->pBorderPixmap = NullPixmap;
pAttr->values = values;
/* /*
* go through the mask, checking the values, * go through the mask, checking the values,
* looking up pixmaps and cursors and hold a reference * looking up pixmaps and cursors and hold a reference