Mesa (master): mesa: Use static buffer for uniform name

Ian Romanick idr at kemper.freedesktop.org
Wed Jan 11 12:52:21 PST 2012


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

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Mon Nov 14 16:52:05 2011 -0800

mesa: Use static buffer for uniform name

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

---

 src/mesa/main/ff_fragment_shader.cpp |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/ff_fragment_shader.cpp b/src/mesa/main/ff_fragment_shader.cpp
index 49a8af0..165230c 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;



More information about the mesa-commit mailing list