diff options
| -rw-r--r-- | src/testdir/test_xxd.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/testdir/test_xxd.vim b/src/testdir/test_xxd.vim index 642f5e709e..a91a1fcf92 100644 --- a/src/testdir/test_xxd.vim +++ b/src/testdir/test_xxd.vim @@ -412,9 +412,12 @@ func Test_xxd_max_cols() endfunc -" Try to trigger a buffer overflow (#14738) +" This used to trigger a buffer overflow (#14738) func Test_xxd_buffer_overflow() CheckUnix + if system('file ' .. s:xxd_cmd) =~ '32-bit' + throw 'Skipped: test only works on 64-bit architecture' + endif new let input = repeat('A', 256) call writefile(['-9223372036854775808: ' . repeat("\e[1;32m41\e[0m ", 256) . ' ' . repeat("\e[1;32mA\e[0m", 256)], 'Xxdexpected', 'D') diff --git a/src/version.c b/src/version.c index 6bb8be6f4e..cbd29097d8 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 405, +/**/ 404, /**/ 403, |