diff --git a/backport-CVE-2022-0943.patch b/backport-CVE-2022-0943.patch
new file mode 100644
index 0000000000000000000000000000000000000000..96341bb7e5b3079c8c35772c1601443302511be1
--- /dev/null
+++ b/backport-CVE-2022-0943.patch
@@ -0,0 +1,57 @@
+From 5c68617d395f9d7b824f68475b24ce3e38d653a3 Mon Sep 17 00:00:00 2001
+From: Bram Moolenaar <Bram@vim.org>
+Date: Sun, 13 Mar 2022 20:12:25 +0000
+Subject: [PATCH] patch 8.2.4563: "z=" in Visual mode may go beyond the end of
+ the line
+
+Problem:    "z=" in Visual mode may go beyond the end of the line.
+Solution:   Adjust "badlen".
+---
+ src/spellsuggest.c         |  4 ++++
+ src/testdir/test_spell.vim | 15 +++++++++++++++
+ 2 files changed, 19 insertions(+)
+
+diff --git a/src/spellsuggest.c b/src/spellsuggest.c
+index cd28798..429e292 100644
+--- a/src/spellsuggest.c
++++ b/src/spellsuggest.c
+@@ -501,6 +501,10 @@ spell_suggest(int count)
+ 	    curwin->w_cursor.col = VIsual.col;
+ 	++badlen;
+ 	end_visual_mode();
++	// make sure we don't include the NUL at the end of the line
++	line = ml_get_curline();
++	if (badlen > STRLEN(line) - curwin->w_cursor.col)
++	    badlen = STRLEN(line) - curwin->w_cursor.col;
+     }
+     // Find the start of the badly spelled word.
+     else if (spell_move_to(curwin, FORWARD, TRUE, TRUE, NULL) == 0
+diff --git a/src/testdir/test_spell.vim b/src/testdir/test_spell.vim
+index de49b42..49118a9 100644
+--- a/src/testdir/test_spell.vim
++++ b/src/testdir/test_spell.vim
+@@ -131,6 +131,21 @@ func Test_spellreall()
+   bwipe!
+ endfunc
+ 
++func Test_spellsuggest_visual_end_of_line()
++  let enc_save = &encoding
++  set encoding=iso8859
++
++  " This was reading beyond the end of the line.
++  norm R00000000000
++  sil norm 0
++  sil! norm i00000)
++  sil! norm i00000)
++  call feedkeys("\<CR>")
++  norm z=
++
++  let &encoding = enc_save
++endfunc
++
+ func Test_spellinfo()
+   new
+   let runtime = substitute($VIMRUNTIME, '\\', '/', 'g')
+-- 
+2.27.0
+
diff --git a/vim.spec b/vim.spec
index 887616145cc09fd2b116d94ed4c0c2bf824b3a46..33db6fe98c46ff37fa341e132a462bf8cd75ecf5 100644
--- a/vim.spec
+++ b/vim.spec
@@ -11,7 +11,7 @@
 Name:           vim
 Epoch:          2
 Version:        8.2
-Release:        23
+Release:        24
 Summary:        Vim is a highly configurable text editor for efficiently creating and changing any kind of text.
 License:        Vim and MIT
 URL:            http://www.vim.org
@@ -81,6 +81,7 @@ Patch6047:      backport-CVE-2022-0629.patch
 Patch6048:      backport-CVE-2022-0714.patch
 Patch6049:      backport-CVE-2022-0729.patch
 Patch6050:      backport-CVE-2022-0685.patch
+Patch6051:      backport-CVE-2022-0943.patch
 
 Patch9000:      bugfix-rm-modify-info-version.patch
 Patch9001:      remove-failed-tests-due-to-patch.patch
@@ -483,6 +484,12 @@ LC_ALL=en_US.UTF-8 make -j1 test
 %{_mandir}/man1/evim.*
 
 %changelog
+* Thu Mar 24 2022 yuanxin <yuanxin24@h-partners.com> - 2:8.2-24
+- Type:CVE
+- ID:CVE-2022-0943
+- SUG:NA
+- DESC:fix CVE-2022-0943
+
 * Sat Mar 19 2022 yuanxin <yuanxin24@h-partners.com> - 2:8.2-23
 - Type:bugfix
 - ID:NA