diff --git a/src/fileio.c b/src/fileio.c
index 8917a7e291..e057b78adb 100644
--- 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 9bf8c84172..003ddcacb3 100644
--- 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,
 /**/