From: Julian Seward <jseward@acm.org>
Date: Tue, 26 Dec 2006 04:29:17 +0000 (+0000)
Subject: Merge r6417: Always ensure that the output buffer is zero-terminated,
X-Git-Tag: svn/VALGRIND_3_2_2~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c8cc6b86e0a7ec6c379f0498880c7b725831461;p=thirdparty%2Fvalgrind.git

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 118cad1e3e..a883cfe539 100644
--- 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 */
    } 
 }