patch 9.2.0242: memory leak in check_for_cryptkey()

Problem:  memory leak in check_for_cryptkey()
Solution: Free cryptkey if it had been allocated
          (Huihui Huang)

closes: #19821

Signed-off-by: Huihui Huang <625173@qq.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>

diff --git a/src/fileio.c b/src/fileio.c
index 8917a7e291d9593e2b34343a2f095dc771d25ce9..e057b78adbc6fe9f9d5aab80cd7dc7c98d2e560e 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3074,8 +3074,12 @@ check_for_cryptkey(
 
            header_len = crypt_get_header_len(method);
            if (*sizep < header_len)
+           {
                // invalid header, buffer can't be encrypted
+               if (cryptkey != curbuf->b_p_key)
+                   vim_free(cryptkey);
                return NULL;
+           }
 
            curbuf->b_cryptstate = crypt_create_from_header(
                                                        method, cryptkey, ptr);

diff --git a/src/version.c b/src/version.c
index 9bf8c841729eb4f76fe1b96e10297f427620c88d..003ddcacb3b12c61557b82fc86454ed6f429d096 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    242,
 /**/
     241,
 /**/