Merge branch 'mesa_7_6_branch' of git://anongit.freedesktop.org/mesa/mesa into debian-unstable

Conflicts:
	progs/tests/bug_texstore_i8.c
	progs/tests/crossbar.c
	progs/tests/cva.c
	progs/tests/fptest1.c
	progs/tests/invert.c
	progs/tests/packedpixels.c
	progs/tests/quads.c
	progs/tests/scissor-viewport.c
	progs/tests/scissor.c
	progs/tests/stencilwrap.c
	progs/tests/tex1d.c
	progs/tests/texcomp_image.h
	progs/tests/unfilledclip.c
	progs/tests/vpeval.c
	progs/trivial/clear-fbo-tex.c
	progs/trivial/createwin.c
	progs/trivial/dlist-begin-call-end.c
	progs/trivial/draw2arrays.c
	progs/trivial/drawarrays.c
	progs/trivial/tri-blend-max.c
	progs/trivial/tri-blend-min.c
	progs/trivial/tri-blend-revsub.c
	progs/trivial/tri-blend-sub.c
	progs/trivial/tri-blend.c
	progs/trivial/tri-fbo-tex.c
	progs/trivial/tri-fp.c
	progs/trivial/tri-logicop-none.c
	progs/trivial/tri-logicop-xor.c
	progs/trivial/tri-z.c
	progs/trivial/vbo-drawarrays.c
	progs/trivial/vbo-noninterleaved.c
	scons/gallium.py
	scons/generic.py

1 files changed, 4 insertions, 2 deletions

diff --git a/src/gallium/auxiliary/util/u_debug.c b/src/gallium/auxiliary/util/u_debug.c
index 96d400c839b..be5eb87e474 100644
--- a/src/gallium/auxiliary/util/u_debug.c
+++ b/src/gallium/auxiliary/util/u_debug.c
@@ -452,7 +452,8 @@ debug_dump_flags(const struct debug_named_value *names,
 	    util_strncat(output, "|", sizeof(output));
 	 else
 	    first = 0;
-	 util_strncat(output, names->name, sizeof(output));
+	 util_strncat(output, names->name, sizeof(output) - 1);
+	 output[sizeof(output) - 1] = '\0';
 	 value &= ~names->value;
       }
       ++names;
@@ -465,7 +466,8 @@ debug_dump_flags(const struct debug_named_value *names,
 	 first = 0;
       
       util_snprintf(rest, sizeof(rest), "0x%08lx", value);
-      util_strncat(output, rest, sizeof(output));
+      util_strncat(output, rest, sizeof(output) - 1);
+      output[sizeof(output) - 1] = '\0';
    }
    
    if(first)