From 9a4e6805a43ef295f71a94971ccc79fa48eb3100 Mon Sep 17 00:00:00 2001
From: root <root@localhost.localdomain>
Date: Fri, 17 Nov 2023 13:52:58 +0800
Subject: [PATCH] CVE-2023-48235

---
 src/ex_docmd.c             | 2 +-
 src/testdir/test_excmd.vim | 5 ++++-
 src/version.c              | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index e8e41ad..559dc1b 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -4603,7 +4603,7 @@ get_address(
 		    lnum -= n;
 		else
 		{
-		    if (n >= LONG_MAX - lnum)
+		    if (lnum >= 0 && n >= LONG_MAX - lnum)
 		    {
 			emsg(_(e_line_number_out_of_range));
 			goto error;
diff --git a/src/testdir/test_excmd.vim b/src/testdir/test_excmd.vim
index f55e6a5..d6f3a37 100644
--- a/src/testdir/test_excmd.vim
+++ b/src/testdir/test_excmd.vim
@@ -725,5 +725,8 @@ func Test_using_zero_in_range()
   bwipe!
 endfunc
 
-
+" catch address lines overflow
+func Test_ex_address_range_overflow()
+  call assert_fails(':--+foobar', 'E492:')
+endfunc
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index 5e21279..6cf6862 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2110,
 /**/
     0
 };
-- 
2.27.0