summaryrefslogtreecommitdiffstats
path: root/src/memfile.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-06-09 18:35:25 +0200
committerBram Moolenaar <Bram@vim.org>2015-06-09 18:35:25 +0200
commitbc56336bb4501884257352446abb60713cef6452 (patch)
treebf4f55292e2e42533ceadfbd769aab281868a290 /src/memfile.c
parent0481fee48800817bee206bb2f958fe04be4d8db6 (diff)
patch 7.4.730v7.4.730
Problem: When setting the crypt key and using a swap file, text may be encrypted twice or unencrypted text remains in the swap file. (Issue 369) Solution: Call ml_preserve() before re-encrypting. Set correct index for next pointer block.
Diffstat (limited to 'src/memfile.c')
-rw-r--r--src/memfile.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/memfile.c b/src/memfile.c
index 57c9d92fd2..a21b7076ae 100644
--- a/src/memfile.c
+++ b/src/memfile.c
@@ -811,6 +811,8 @@ mf_rem_used(mfp, hp)
*
* Return the block header to the caller, including the memory block, so
* it can be re-used. Make sure the page_count is right.
+ *
+ * Returns NULL if no block is released.
*/
static bhdr_T *
mf_release(mfp, page_count)
@@ -1219,7 +1221,7 @@ mf_trans_add(mfp, hp)
}
/*
- * Lookup a translation from the trans lists and delete the entry
+ * Lookup a translation from the trans lists and delete the entry.
*
* Return the positive new number when found, the old number when not found
*/