63 lines
1.6 KiB
Diff
63 lines
1.6 KiB
Diff
From de05bb25733c3319e18dca44e9b59c6ee389eb26 Mon Sep 17 00:00:00 2001
|
|
From: Bram Moolenaar <Bram@vim.org>
|
|
Date: Thu, 13 Jan 2022 13:08:14 +0000
|
|
Subject: [PATCH] patch 8.2.4074: going over the end of NameBuff
|
|
|
|
Problem: Going over the end of NameBuff.
|
|
Solution: Check length when appending a space.
|
|
|
|
---
|
|
src/drawscreen.c | 9 +++++----
|
|
src/testdir/test_edit.vim | 15 +++++++++++++++
|
|
src/version.c | 2 ++
|
|
3 files changed, 22 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/drawscreen.c b/src/drawscreen.c
|
|
index 9acb705..7425ad4 100644
|
|
--- a/src/drawscreen.c
|
|
+++ b/src/drawscreen.c
|
|
@@ -437,12 +437,13 @@ win_redr_status(win_T *wp, int ignore_pum UNUSED)
|
|
p = NameBuff;
|
|
len = (int)STRLEN(p);
|
|
|
|
- if (bt_help(wp->w_buffer)
|
|
+ if ((bt_help(wp->w_buffer)
|
|
#ifdef FEAT_QUICKFIX
|
|
- || wp->w_p_pvw
|
|
+ || wp->w_p_pvw
|
|
#endif
|
|
- || bufIsChanged(wp->w_buffer)
|
|
- || wp->w_buffer->b_p_ro)
|
|
+ || bufIsChanged(wp->w_buffer)
|
|
+ || wp->w_buffer->b_p_ro)
|
|
+ && len < MAXPATHL - 1)
|
|
*(p + len++) = ' ';
|
|
if (bt_help(wp->w_buffer))
|
|
{
|
|
diff --git a/src/testdir/test_edit.vim b/src/testdir/test_edit.vim
|
|
index c3b1af5..48e6ff2 100644
|
|
--- a/src/testdir/test_edit.vim
|
|
+++ b/src/testdir/test_edit.vim
|
|
@@ -1532,3 +1532,18 @@ func Test_edit_put_CTRL_E()
|
|
set encoding=utf-8
|
|
endfunc
|
|
|
|
+" Weird long file name was going over the end of NameBuff
|
|
+func Test_edit_overlong_file_name()
|
|
+ CheckUnix
|
|
+
|
|
+ file 0000000000000000000000000000
|
|
+ file %%%%%%%%%%%%%%%%%%%%%%%%%%
|
|
+ file %%%%%%
|
|
+ set readonly
|
|
+ set ls=2
|
|
+
|
|
+ redraw!
|
|
+ set noreadonly ls&
|
|
+ bwipe!
|
|
+endfunc
|
|
+
|
|
--
|
|
2.23.0
|
|
|