From: Ian Romanick <ian.d.romanick@intel.com>
Date: Tue, 15 Nov 2011 00:52:05 +0000 (-0800)
Subject: mesa: Use static buffer for uniform name
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ca5b30bf8142d916a40eaaa7091882464a237f1f;p=mesa.git

mesa: Use static buffer for uniform name

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp
index 49a8af090f5..165230c13b1 100644
--- a/src/mesa/main/ff_fragment_shader.cpp
+++ b/src/mesa/main/ff_fragment_shader.cpp
@@ -1509,7 +1509,12 @@ create_new_program(struct gl_context *ctx, struct state_key *key)
    _mesa_associate_uniform_storage(ctx, p.shader_program, fp->Parameters);
 
    for (unsigned int i = 0; i < MAX_TEXTURE_UNITS; i++) {
-      char *name = ralloc_asprintf(p.mem_ctx, "sampler_%d", i);
+      /* Enough space for 'sampler_999\0'.
+       */
+      char name[12];
+
+      snprintf(name, sizeof(name), "sampler_%d", i);
+
       int loc = _mesa_get_uniform_location(ctx, p.shader_program, name);
       if (loc != -1) {
 	 unsigned base;