diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-06-29 21:32:06 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-06-29 21:32:06 +0200 |
| commit | 6378b21d6dd38cc0f80aa6d31d747db6c287483b (patch) | |
| tree | c9d1a746efb71afc61d8dc4a03db7c8e9d36e5a4 | |
| parent | 566cc8c72bb8036f015a435800f28ef9f6a9a3b6 (diff) | |
| download | vim-git-6378b21d6dd38cc0f80aa6d31d747db6c287483b.tar.gz | |
patch 8.2.1088: a very long translation might cause a buffer overflowv8.2.1088
Problem: A very long translation might cause a buffer overflow.
Solution: Trunctate the message if needed.
| -rw-r--r-- | src/fileio.c | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/fileio.c b/src/fileio.c index 395e54b6a..81a502665 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -52,10 +52,14 @@ filemess( if (msg_silent != 0) return; msg_add_fname(buf, name); // put file name in IObuff with quotes + // If it's extremely long, truncate it. - if (STRLEN(IObuff) > IOSIZE - 80) - IObuff[IOSIZE - 80] = NUL; - STRCAT(IObuff, s); + if (STRLEN(IObuff) > IOSIZE - 100) + IObuff[IOSIZE - 100] = NUL; + + // Avoid an over-long translation to cause trouble. + STRNCAT(IObuff, s, 99); + /* * For the first message may have to start a new line. * For further ones overwrite the previous one, reset msg_scroll before diff --git a/src/version.c b/src/version.c index f38c978b2..48ff321ca 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1088, +/**/ 1087, /**/ 1086, |