# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1605042903 -3600
# Node ID 3b476f97440600202feba2cc04d979475947b1b9
# Parent  eb8514ea9e596e0e717159edc02729d2f388929e
patch 8.2.1975: Win32: memory leak when encoding conversion fails

Commit: https://github.com/vim/vim/commit/bbf9f344afd08954163191ed678352fb554fc254
Author: Bram Moolenaar <Bram@vim.org>
Date:   Tue Nov 10 22:03:40 2020 +0100

    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 https://github.com/vim/vim/issues/7277)

diff --git a/src/os_win32.c b/src/os_win32.c
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1975,
+/**/
     1974,
 /**/
     1973,