patch 7.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.
This commit is contained in:
Bram Moolenaar
2015-06-09 18:35:25 +02:00
parent 0481fee488
commit bc56336bb4
5 changed files with 48 additions and 17 deletions

View File

@ -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
*/