From f9435e49ef8032e80d38e31e950e4a9b75387533 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 16 Feb 2022 16:33:28 +0000
Subject: [PATCH] patch 8.2.4399: crash after ml_get error

Problem:    Crash after ml_get error.
Solution:   When returning "???" flush the line and set ml_line_lnum.
---
 src/memline.c | 3 +++
 src/version.c | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/src/memline.c b/src/memline.c
index c18109aefe..9c15fa7743 100644
--- a/src/memline.c
+++ b/src/memline.c
@@ -2619,9 +2619,12 @@ ml_get_buf(
 	    siemsg(_(e_ml_get_invalid_lnum_nr), lnum);
 	    --recursive;
 	}
+	ml_flush_line(buf);
+	buf->b_ml.ml_flags &= ~ML_LINE_DIRTY;
 errorret:
 	STRCPY(questions, "???");
 	buf->b_ml.ml_line_len = 4;
+	buf->b_ml.ml_line_lnum = lnum;
 	return questions;
     }
     if (lnum <= 0)			// pretend line 0 is line 1
diff --git a/src/version.c b/src/version.c
index 4bfca872c5..4f17acffd4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4399,
 /**/
     4398,
 /**/