From: John Marriott <basilisk@internode.on.net>
Date: Thu, 17 Apr 2025 18:35:42 +0000 (+0200)
Subject: patch 9.1.1316: missing memory allocation failure in os_mswin.c
X-Git-Tag: v9.1.1316^0
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ddba51635abdacb2bf8b96bff2ddfdefa0c985b;p=thirdparty%2Fvim.git

patch 9.1.1316: missing memory allocation failure in os_mswin.c

Problem:  missing memory allocation failure in os_mswin.c
Solution: check for memory allocation failure and return early.
          (John Marriott)

closes: #17134

Signed-off-by: John Marriott <basilisk@internode.on.net>
Signed-off-by: Christian Brabandt <cb@256bit.org>
---

diff --git a/src/os_mswin.c b/src/os_mswin.c
index 485ee20afc..c47346033f 100644
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -2307,16 +2307,20 @@ findServer(char_u *name)
     void
 serverSetName(char_u *name)
 {
+    size_t	namelen;
     char_u	*ok_name;
     HWND	hwnd = 0;
     int		i = 0;
     char_u	*p;
 
     // Leave enough space for a 9-digit suffix to ensure uniqueness!
-    ok_name = alloc(STRLEN(name) + 10);
+    namelen = STRLEN(name);
+    ok_name = alloc(namelen + 10);
+    if (ok_name == NULL)
+	return;
 
     STRCPY(ok_name, name);
-    p = ok_name + STRLEN(name);
+    p = ok_name + namelen;
 
     for (;;)
     {
diff --git a/src/proto/os_mswin.pro b/src/proto/os_mswin.pro
index 055cf8cd3a..e8e08d2ee5 100644
--- a/src/proto/os_mswin.pro
+++ b/src/proto/os_mswin.pro
@@ -1,4 +1,5 @@
 /* os_mswin.c */
+void SaveInst(HINSTANCE hInst);
 void mch_exit_g(int r);
 void mch_early_init(void);
 int mch_input_isatty(void);
diff --git a/src/version.c b/src/version.c
index 9a1926004c..abd0fa3661 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 */
+/**/
+    1316,
 /**/
     1315,
 /**/