From 1c478391ca7754bf5ecb4b76c29acfa9b4978393 Mon Sep 17 00:00:00 2001
From: zeertzjq <zeertzjq@outlook.com>
Date: Sat, 15 Oct 2022 07:24:03 +0800
Subject: [PATCH] vim-patch:9.0.0750: crash when popup closed in callback
 (#20659)

Problem:    Crash when popup closed in callback. (Maxim Kim)
Solution:   In syntax_end_parsing() check that syn_block is valid.
https://github.com/vim/vim/commit/0abd6cf62d65180dc2c40d67cd95f13b0691f7ea
---
 src/nvim/drawscreen.c | 4 ++--
 src/nvim/syntax.c     | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/nvim/drawscreen.c b/src/nvim/drawscreen.c
index 15a7294496..4ece72a6d5 100644
--- a/src/nvim/drawscreen.c
+++ b/src/nvim/drawscreen.c
@@ -1753,7 +1753,7 @@ win_update_start:
         // Let the syntax stuff know we skipped a few lines.
         if (syntax_last_parsed != 0 && syntax_last_parsed + 1 < lnum
             && syntax_present(wp)) {
-          syntax_end_parsing(syntax_last_parsed + 1);
+          syntax_end_parsing(wp, syntax_last_parsed + 1);
         }
 
         // Display one line
@@ -1827,7 +1827,7 @@ win_update_start:
 
   // Let the syntax stuff know we stop parsing here.
   if (syntax_last_parsed != 0 && syntax_present(wp)) {
-    syntax_end_parsing(syntax_last_parsed + 1);
+    syntax_end_parsing(wp, syntax_last_parsed + 1);
   }
 
   // If we didn't hit the end of the file, and we didn't finish the last
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 575d475b87..ea78397d8c 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -1327,10 +1327,13 @@ static bool syn_stack_equal(synstate_T *sp)
 //          displayed line
 //          displayed line
 // lnum ->  line below window
-void syntax_end_parsing(linenr_T lnum)
+void syntax_end_parsing(win_T *wp, linenr_T lnum)
 {
   synstate_T *sp;
 
+  if (syn_block != wp->w_s) {
+    return;  // not the right window
+  }
   sp = syn_stack_find_entry(lnum);
   if (sp != NULL && sp->sst_lnum < lnum) {
     sp = sp->sst_next;