XLibre/xf86-video-ati
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-ati.git synced 2026-03-24 01:24:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use RADEONEntPriv in RADEONFreeRec

Browse Source 
It crashes if info == NULL.

(Ported from amdgpu commits fb8444e731765588c0ff1e9053c1c7b73f5f0907 &
 cfccf4c4e7e5c73fe4040fabeb1b43283cf29b33)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Michel Dänzer
2018-02-14 18:13:16 +01:00
committed by Michel Dänzer
parent 703cbb7177
commit 8a55e66bfd
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/radeon_kms.c
View File

@@ -194,18 +194,33 @@ static Bool RADEONGetRec(ScrnInfoPtr pScrn)
/* Free our private RADEONInfoRec */
static void RADEONFreeRec(ScrnInfoPtr pScrn)
{
DevUnion *pPriv;
RADEONEntPtr pRADEONEnt;
RADEONInfoPtr info;
EntityInfoPtr pEnt;
if (!pScrn || !pScrn->driverPrivate) return;
if (!pScrn)
return;
info = RADEONPTR(pScrn);
if (info) {
if (info->fbcon_pixmap)
pScrn->pScreen->DestroyPixmap(info->fbcon_pixmap);
if (info->fbcon_pixmap)
pScrn->pScreen->DestroyPixmap(info->fbcon_pixmap);
if (info->accel_state) {
free(info->accel_state);
info->accel_state = NULL;
}
pRADEONEnt = RADEONEntPriv(pScrn);
pEnt = info->pEnt;
free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
} else {
pEnt = xf86GetEntityInfo(pScrn->entityList[pScrn->numEntities - 1]);
}
pPriv = xf86GetEntityPrivate(pEnt->index, gRADEONEntityIndex);
pRADEONEnt = pPriv->ptr;
if (pRADEONEnt->fd > 0) {
DevUnion *pPriv;
RADEONEntPtr pRADEONEnt;
@@ -225,14 +240,7 @@ static void RADEONFreeRec(ScrnInfoPtr pScrn)
}
}
if (info->accel_state) {
free(info->accel_state);
info->accel_state = NULL;
}
free(info->pEnt);
free(pScrn->driverPrivate);
pScrn->driverPrivate = NULL;
free(pEnt);
}
static void *