From 749e52049dee6717023309f6446efb2c89ed720c Mon Sep 17 00:00:00 2001 From: Keith Whitwell Date: Thu, 13 Aug 2009 14:27:42 +0100 Subject: tgsi: use REALLOC for growing token pool --- src/gallium/auxiliary/tgsi/tgsi_ureg.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'src/gallium/auxiliary') diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.c b/src/gallium/auxiliary/tgsi/tgsi_ureg.c index 00ae0e3f06..7e1eb0dc0a 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_ureg.c +++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.c @@ -118,7 +118,7 @@ static void tokens_error( struct ureg_tokens *tokens ) static void tokens_expand( struct ureg_tokens *tokens, unsigned count ) { - union tgsi_any_token *tmp; + unsigned old_size = tokens->size * sizeof(unsigned); if (tokens->tokens == error_tokens) goto fail; @@ -127,18 +127,12 @@ static void tokens_expand( struct ureg_tokens *tokens, tokens->size = (1 << ++tokens->order); } - tmp = MALLOC(tokens->size * sizeof(unsigned)); - if (tmp == NULL) { - FREE(tokens->tokens); + tokens->tokens = REALLOC(tokens->tokens, + old_size, + tokens->size * sizeof(unsigned)); + if (tokens->tokens == NULL) goto fail; - } - - if (tokens->count) { - memcpy(tmp, tokens->tokens, tokens->count * sizeof tokens->tokens[0] ); - FREE(tokens->tokens); - } - tokens->tokens = tmp; return; fail: -- cgit v1.2.3