From e1be11864d1f4383171e3af3eb77e61d41140c4e Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 24 Oct 2020 13:30:51 +0200 Subject: [PATCH] patch 8.2.1896: valgrind warns for using uninitialized memory MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Problem: Valgrind warns for using uninitialized memory. Solution: NUL terminate the SmcOpenConnection() error message. (Dominique Pellé, closes #7194) --- src/os_unix.c | 7 +++++-- src/version.c | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/os_unix.c b/src/os_unix.c index 40df6b727c..27a88823f0 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -8068,10 +8068,13 @@ xsmp_init(void) errorstring); if (xsmp.smcconn == NULL) { - char errorreport[132]; - if (p_verbose > 0) { + char errorreport[132]; + + // If the message is too long it might not be NUL terminated. Add + // a NUL at the end to make sure we don't go over the end. + errorstring[sizeof(errorstring) - 1] = NUL; vim_snprintf(errorreport, sizeof(errorreport), _("XSMP SmcOpenConnection failed: %s"), errorstring); verb_msg(errorreport); diff --git a/src/version.c b/src/version.c index e445117bcd..a1ee33e1ac 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1896, /**/ 1895, /**/ -- 2.47.3