fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-09 04:58:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

xv: fix double free in AddResource failure case

Browse source 
XvdiDestroyVideoNotifyList already frees the list if AddResource fails,
so don't do it twice.  And set tpn->client to NULL explicitly to avoid
confusing uninitialized memory with a valid value.

Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Julien Cristau <jcristau@debian.org>
(cherry picked from commit 939ce0bae6)
This commit is contained in:
Julien Cristau 2016-03-01 21:39:01 +01:00 • committed by Adam Jackson
parent 90b854b2ac
commit 23d9b2a566
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Xext/xvmain.c
View file

@ -800,10 +800,9 @@ XvdiSelectVideoNotify(ClientPtr client, DrawablePtr pDraw, BOOL onoff)
if (!(tpn = malloc(sizeof(XvVideoNotifyRec)))) if (!(tpn = malloc(sizeof(XvVideoNotifyRec))))
return BadAlloc; return BadAlloc;
tpn->next = NULL; tpn->next = NULL;
if (!AddResource(pDraw->id, XvRTVideoNotifyList, tpn)) { tpn->client = NULL;
free(tpn); if (!AddResource(pDraw->id, XvRTVideoNotifyList, tpn))
return BadAlloc; return BadAlloc;
}
} }
else { else {
/* LOOK TO SEE IF ENTRY ALREADY EXISTS */ /* LOOK TO SEE IF ENTRY ALREADY EXISTS */