From 9288253051feb05ba155e4f939284360fdd70b15 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Thu, 3 Nov 2011 20:55:10 -0700 Subject: pp: Reorder calloc to avoid memory leak on error path. Fixes Coverity resource leak defect. Reviewed-by: Brian Paul --- src/gallium/auxiliary/postprocess/pp_mlaa.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/gallium/auxiliary/postprocess') diff --git a/src/gallium/auxiliary/postprocess/pp_mlaa.c b/src/gallium/auxiliary/postprocess/pp_mlaa.c index f514e692985..51bc02edacc 100644 --- a/src/gallium/auxiliary/postprocess/pp_mlaa.c +++ b/src/gallium/auxiliary/postprocess/pp_mlaa.c @@ -212,9 +212,7 @@ pp_jimenezmlaa_init_run(struct pp_queue_t *ppq, unsigned int n, struct pipe_box box; struct pipe_resource res; - - char *tmp_text = CALLOC(sizeof(blend2fs_1) + sizeof(blend2fs_2) + - IMM_SPACE, sizeof(char)); + char *tmp_text; constbuf = pipe_buffer_create(ppq->p->screen, PIPE_BIND_CONSTANT_BUFFER, PIPE_USAGE_STATIC, sizeof(constants)); @@ -226,6 +224,9 @@ pp_jimenezmlaa_init_run(struct pp_queue_t *ppq, unsigned int n, pp_debug("mlaa: using %u max search steps\n", val); + tmp_text = CALLOC(sizeof(blend2fs_1) + sizeof(blend2fs_2) + + IMM_SPACE, sizeof(char)); + if (!tmp_text) { pp_debug("Failed to allocate shader space\n"); return; -- cgit v1.2.3