Merge r6417: Always ensure that the output buffer is zero-terminated,

even if it is already full.  (Nick N)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_2_BRANCH@6435

diff --git a/coregrind/m_libcprint.c b/coregrind/m_libcprint.c
index 118cad1e3ea9160aaba43502281beada03db1410..a883cfe5397c0e8961497e29fa72d049bb27a1e6 100644 (file)
--- a/coregrind/m_libcprint.c
+++ b/coregrind/m_libcprint.c
@@ -168,6 +168,8 @@ static void add_to_vg_snprintf_buf ( HChar c, void* p )
       b->buf[b->buf_used++] = c;
       if (b->buf_used < b->buf_size)
          b->buf[b->buf_used] = 0;
+      else
+         b->buf[b->buf_size-1] = 0; /* pre: b->buf_size > 0 */
    } 
 }