Mesa (master): st/mesa: s/CALLOC/calloc/ to fix allocation bug
Brian Paul
brianp at kemper.freedesktop.org
Fri Aug 31 14:06:00 UTC 2012
Module: Mesa
Branch: master
Commit: 43ed822a50db6b980041ddf91c16c7f8fccc4092
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=43ed822a50db6b980041ddf91c16c7f8fccc4092
Author: Brian Paul <brianp at vmware.com>
Date: Thu Aug 30 16:12:53 2012 -0600
st/mesa: s/CALLOC/calloc/ to fix allocation bug
The CALLOC() macro only takes one argument so this was being treated
as a comma expression. Simply use calloc() instead.
A follow-on patch will replace all CALLOC() calls with calloc().
NOTE: This is a candidate for the 8.0 and 9.0 branches.
---
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;
More information about the mesa-commit
mailing list