From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 10 Nov 2020 21:03:40 +0000 (+0100)
Subject: patch 8.2.1975: Win32: memory leak when encoding conversion fails
X-Git-Tag: v8.2.1975
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bbf9f344afd08954163191ed678352fb554fc254;p=vim

patch 8.2.1975: Win32: memory leak when encoding conversion fails

Problem:    Win32: memory leak when encoding conversion fails.
Solution:   Free the allocated memory. (Ken Takata, closes #7277)
---

diff --git a/src/os_win32.c b/src/os_win32.c
index 52573fe62..60c04632c 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -3532,7 +3532,10 @@ mch_get_acl(char_u *fname)
 
 	wn = enc_to_utf16(fname, NULL);
 	if (wn == NULL)
+	{
+	    vim_free(p);
 	    return NULL;
+	}
 
 	// Try to retrieve the entire security descriptor.
 	err = GetNamedSecurityInfoW(
diff --git a/src/version.c b/src/version.c
index 06fa4d041..872c25a9b 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 */
+/**/
+    1975,
 /**/
     1974,
 /**/