Mesa (master): glsl: Fix invalid use of ralloc_asprintf in prototype_string .

Kenneth Graunke kwg at kemper.freedesktop.org
Wed Feb 2 07:35:15 UTC 2011


Module: Mesa
Branch: master
Commit: cfd8d45ccde3252fd9a27fe0b2031a35f437a6a2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=cfd8d45ccde3252fd9a27fe0b2031a35f437a6a2

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Tue Feb  1 23:31:35 2011 -0800

glsl: Fix invalid use of ralloc_asprintf in prototype_string.

This was my mistake when converting from talloc to ralloc.  I was
confused because the other calls in the function are to asprintf_append
and the original code used str as the context rather than NULL.

Fixes bug #33823.

---

 src/glsl/ast_function.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/ast_function.cpp b/src/glsl/ast_function.cpp
index 28d49ee..7611617 100644
--- a/src/glsl/ast_function.cpp
+++ b/src/glsl/ast_function.cpp
@@ -75,7 +75,7 @@ prototype_string(const glsl_type *return_type, const char *name,
    char *str = NULL;
 
    if (return_type != NULL)
-      ralloc_asprintf(&str, "%s ", return_type->name);
+      str = ralloc_asprintf(NULL, "%s ", return_type->name);
 
    ralloc_asprintf_append(&str, "%s(", name);
 




More information about the mesa-commit mailing list