Mercurial > vim

changeset 10158:dd0531938cb6 v7.4.2349

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/2321ca2a78286bc026fa7f407281ddbeb04114bb Author: Bram Moolenaar <Bram@vim.org> Date: Fri Sep 9 14:17:18 2016 +0200 patch 7.4.2349 Problem: Valgrind reports using uninitialzed memory. (Dominique Pelle) Solution: Check the length before checking for a NUL.
author Christian Brabandt <cb@256bit.org>
date Fri, 09 Sep 2016 14:30:08 +0200
parents dc0ef5ba2d24
children 0ccc6c45ff5b
files src/message.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/message.c
+++ b/src/message.c
@@ -2462,7 +2462,7 @@ msg_puts_printf(char_u *str, int maxlen)
     if (!(silent_mode && p_verbose == 0))
 	mch_settmode(TMODE_COOK);	/* handle '\r' and '\n' correctly */
 #endif
-    while (*s != NUL && (maxlen < 0 || (int)(s - str) < maxlen))
+    while ((maxlen < 0 || (int)(s - str) < maxlen) && *s != NUL)
     {
 	if (!(silent_mode && p_verbose == 0))
 	{
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2349,
+/**/
     2348,
 /**/
     2347,