From fbe2dd7b4c9c41107fa355f58ebc6ed7d19a0f50 Mon Sep 17 00:00:00 2001
From: John Marriott <basilisk@internode.on.net>
Date: Thu, 20 Feb 2025 23:17:09 +0100
Subject: [PATCH] patch 9.1.1129: missing out-of-memory test in buf_write()

Problem:  missing out-of-memory test in buf_write()
Solution: Check that the returned allocated buffer is not NULL
          (John Marriott)

closes: #16678

Signed-off-by: John Marriott <basilisk@internode.on.net>
Signed-off-by: Christian Brabandt <cb@256bit.org>
---
 src/bufwrite.c | 2 ++
 src/version.c  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/src/bufwrite.c b/src/bufwrite.c
index 23cd884bfa..e88c7b8384 100644
--- a/src/bufwrite.c
+++ b/src/bufwrite.c
@@ -2316,6 +2316,8 @@ restore_backup:
 		{
 		    errmsg_allocated = TRUE;
 		    errmsg = alloc(300);
+		    if (errmsg == NULL)
+			goto fail;
 		    vim_snprintf((char *)errmsg, 300, _(e_write_error_conversion_failed_in_line_nr_make_fenc_empty_to_override),
 					 (long)write_info.bw_conv_error_lnum);
 		}
diff --git a/src/version.c b/src/version.c
index fc31646662..646905303f 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 */
+/**/
+    1129,
 /**/
     1128,
 /**/