Commit: patch 9.1.0579: Ex command is still executed after giving E1247

2 views
Skip to first unread message

Christian Brabandt

unread,
Jul 17, 2024, 2:13:35 AM7/17/24
to vim...@googlegroups.com
patch 9.1.0579: Ex command is still executed after giving E1247

Commit: https://github.com/vim/vim/commit/d1b5ea984d41102d253ecdd9a76124cd4c58b97d
Author: zeertzjq <zeer...@outlook.com>
Date: Sat Jul 13 19:04:10 2024 +0200

patch 9.1.0579: Ex command is still executed after giving E1247

Problem: Ex command is still executed after giving E1247.
Solution: Indicate the error properly and set cmd to NULL.
(zeertzjq)

closes: #15241

Signed-off-by: zeertzjq <zeer...@outlook.com>
Signed-off-by: Christian Brabandt <c...@256bit.org>

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 614ba2080..c90d64d7d 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -4698,6 +4698,7 @@ get_address(
if (n == MAXLNUM)
{
emsg(_(e_line_number_out_of_range));
+ cmd = NULL;
goto error;
}
}
@@ -4728,6 +4729,7 @@ get_address(
if (lnum >= 0 && n >= LONG_MAX - lnum)
{
emsg(_(e_line_number_out_of_range));
+ cmd = NULL;
goto error;
}
lnum += n;
diff --git a/src/testdir/test_excmd.vim b/src/testdir/test_excmd.vim
index 221ceb0f0..3b7e489f3 100644
--- a/src/testdir/test_excmd.vim
+++ b/src/testdir/test_excmd.vim
@@ -703,6 +703,8 @@ func Test_address_line_overflow()
call setline(1, range(100))
call assert_fails('|.44444444444444444444444', 'E1247:')
call assert_fails('|.9223372036854775806', 'E1247:')
+ call assert_fails('.44444444444444444444444d', 'E1247:')
+ call assert_equal(range(100)->map('string(v:val)'), getline(1, '$'))

$
yank 77777777777777777777
diff --git a/src/version.c b/src/version.c
index c87d37891..ac04272c6 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 579,
/**/
578,
/**/
Reply all
Reply to author
Forward
0 new messages