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

Bail from dri2_create_buffer2 if we can't get a pixmap

Browse Source 
We would store the NULL pointer and continue, which would lead to a
crash down the road.

Bugzilla: https://bugs.freedesktop.org/106293
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Michel Dänzer
2018-05-17 09:50:50 +02:00
committed by Michel Dänzer
parent fdba537352
commit 3dcfce8d0f
1 changed files with 19 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/radeon_dri2.c
View File

@@ -233,37 +233,36 @@ radeon_dri2_create_buffer2(ScreenPtr pScreen,
flags | RADEON_CREATE_PIXMAP_DRI2);
}
if (!pixmap)
return NULL;
buffers = calloc(1, sizeof *buffers);
if (buffers == NULL)
goto error;
if (pixmap) {
if (!info->use_glamor) {
info->exa_force_create = TRUE;
exaMoveInPixmap(pixmap);
info->exa_force_create = FALSE;
if (exaGetPixmapDriverPrivate(pixmap) == NULL) {
/* this happen if pixmap is non accelerable */
goto error;
}
} else if (is_glamor_pixmap) {
pixmap = radeon_glamor_set_pixmap_bo(drawable, pixmap);
pixmap->refcnt++;
}
if (!radeon_get_flink_name(pRADEONEnt, pixmap, &buffers->name))
if (!info->use_glamor) {
info->exa_force_create = TRUE;
exaMoveInPixmap(pixmap);
info->exa_force_create = FALSE;
if (exaGetPixmapDriverPrivate(pixmap) == NULL) {
/* this happen if pixmap is non accelerable */
goto error;
}
} else if (is_glamor_pixmap) {
pixmap = radeon_glamor_set_pixmap_bo(drawable, pixmap);
pixmap->refcnt++;
}
if (!radeon_get_flink_name(pRADEONEnt, pixmap, &buffers->name))
goto error;
privates = calloc(1, sizeof(struct dri2_buffer_priv));
if (privates == NULL)
goto error;
buffers->attachment = attachment;
if (pixmap) {
buffers->pitch = pixmap->devKind;
buffers->cpp = cpp;
}
buffers->pitch = pixmap->devKind;
buffers->cpp = cpp;
buffers->driverPrivate = privates;
buffers->format = format;
buffers->flags = 0; /* not tiled */
@@ -275,8 +274,7 @@ radeon_dri2_create_buffer2(ScreenPtr pScreen,
error:
free(buffers);
if (pixmap)
(*pScreen->DestroyPixmap)(pixmap);
(*pScreen->DestroyPixmap)(pixmap);
return NULL;
}