From b62dc4fcbcffd10de16650bee284702c8608bb60 Mon Sep 17 00:00:00 2001 From: Dave Airlie Date: Wed, 19 Oct 2011 16:21:26 +0100 Subject: [PATCH] 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 Reviewed-by: Alan Coopersmith Reviewed-by: Jeremy Huddleston --- Xext/saver.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Xext/saver.c b/Xext/saver.c index 142758c87..18d5e468d 100644 --- a/Xext/saver.c +++ b/Xext/saver.c @@ -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