xext: don't free uninitialised pointer when malloc fails. (v2)
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>
This commit is contained in:
parent
22605effd1
commit
b62dc4fcbc
|
@ -925,7 +925,7 @@ ScreenSaverSetAttributes (ClientPtr client)
|
|||
goto bail;
|
||||
}
|
||||
/* over allocate for override redirect */
|
||||
values = malloc((len + 1) * sizeof (unsigned long));
|
||||
pAttr->values = values = malloc((len + 1) * sizeof (unsigned long));
|
||||
if (!values)
|
||||
{
|
||||
ret = BadAlloc;
|
||||
|
@ -945,7 +945,6 @@ ScreenSaverSetAttributes (ClientPtr client)
|
|||
pAttr->pCursor = NullCursor;
|
||||
pAttr->pBackgroundPixmap = NullPixmap;
|
||||
pAttr->pBorderPixmap = NullPixmap;
|
||||
pAttr->values = values;
|
||||
/*
|
||||
* go through the mask, checking the values,
|
||||
* looking up pixmaps and cursors and hold a reference
|
||||
|
|
Loading…
Reference in New Issue
Block a user