[Mesa-dev] [PATCH] st/mesa: s/CALLOC/calloc/ to fix allocation bug

[Brian Paul]

On 08/30/2012 04:16 PM, Brian Paul wrote:
> The CALLOC() macro only takes one argument so this was being treated
> as a comman expression.  Simply use calloc() instead.

Err, "comma" expression.

>
> A follow-on patch will replace all CALLOC() calls with calloc().
>
> NOTE: This is a candidate for the 8.0 branch.
> ---
>   src/mesa/state_tracker/st_mesa_to_tgsi.c |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/src/mesa/state_tracker/st_mesa_to_tgsi.c b/src/mesa/state_tracker/st_mesa_to_tgsi.c
> index 4d99b17..5604714 100644
> --- a/src/mesa/state_tracker/st_mesa_to_tgsi.c
> +++ b/src/mesa/state_tracker/st_mesa_to_tgsi.c
> @@ -1198,7 +1198,7 @@ st_translate_mesa_program(
>       * for these, so we put all the translated regs in t->constants.
>       */
>      if (program->Parameters) {
> -      t->constants = CALLOC( program->Parameters->NumParameters,
> +      t->constants = calloc( program->Parameters->NumParameters,
>                                sizeof t->constants[0] );
>         if (t->constants == NULL) {
>            ret = PIPE_ERROR_OUT_OF_MEMORY;