summaryrefslogtreecommitdiff
path: root/src/crypt.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-02-10 18:45:26 +0100
committerBram Moolenaar <Bram@vim.org>2018-02-10 18:45:26 +0100
commitd23a823669d93fb2a570a039173eefe4856ac806 (patch)
tree617130258eae70e3bd7ef7b6da9c494ffee7b572 /src/crypt.c
parent42443c7d7fecc3a2a72154bb6139b028438617c2 (diff)
downloadvim-git-d23a823669d93fb2a570a039173eefe4856ac806.tar.gz
patch 8.0.1496: clearing a pointer takes two linesv8.0.1496
Problem: Clearing a pointer takes two lines. Solution: Add VIM_CLEAR() and replace vim_clear(). (Hirohito Higashi, closes #2629)
Diffstat (limited to 'src/crypt.c')
-rw-r--r--src/crypt.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/crypt.c b/src/crypt.c
index 81759069f..dfbf02ca5 100644
--- a/src/crypt.c
+++ b/src/crypt.c
@@ -118,6 +118,9 @@ static cryptmethod_T cryptmethods[CRYPT_M_COUNT] = {
NULL, NULL,
crypt_blowfish_encode, crypt_blowfish_decode,
},
+
+ /* NOTE: when adding a new method, use some random bytes for the magic key,
+ * to avoid that a text file is recognized as encrypted. */
};
#define CRYPT_MAGIC_LEN 12 /* cannot change */
@@ -349,10 +352,7 @@ crypt_create_for_writing(
state = crypt_create(method_nr, key, salt, salt_len, seed, seed_len);
if (state == NULL)
- {
- vim_free(*header);
- *header = NULL;
- }
+ VIM_CLEAR(*header);
return state;
}