AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r300g: fix memory leaks in texture_create error paths

Browse Source
This commit is contained in:
Marek Olšák
2012-12-01 22:38:36 +01:00
parent 3e3a586236
commit e694ea09f5
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/gallium/drivers/r300/r300_texture.c
View File

@@ -953,15 +953,16 @@ r300_texture_create_object(struct r300_screen *rscreen,
struct pb_buffer *buffer)
{
struct radeon_winsys *rws = rscreen->rws;
struct r300_resource *tex = CALLOC_STRUCT(r300_resource);
if (!tex) {
if (buffer)
pb_reference(&buffer, NULL);
return NULL;
struct r300_resource *tex = NULL;
if (base->nr_samples > 1) {
goto fail;
}
if (base->nr_samples > 1)
return NULL;
tex = CALLOC_STRUCT(r300_resource);
if (!tex) {
goto fail;
}
pipe_reference_init(&tex->b.b.reference, 1);
tex->b.b.screen = &rscreen->screen;
@@ -985,8 +986,7 @@ r300_texture_create_object(struct r300_screen *rscreen,
base->bind, tex->domain);
if (!tex->buf) {
FREE(tex);
return NULL;
goto fail;
}
}
@@ -998,6 +998,12 @@ r300_texture_create_object(struct r300_screen *rscreen,
tex->tex.stride_in_bytes[0]);
return tex;
fail:
FREE(tex);
if (buffer)
pb_reference(&buffer, NULL);
return NULL;
}
/* Create a new texture. */