aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-29 04:34:16 -04:00
Code Activity

Fix memory access to 'cryptmethod' during recovery. (Dominique Pelle)

Browse Source
This commit is contained in:
Bram Moolenaar
2010-07-25 14:00:46 +02:00
parent 904fb861e7
commit 0ad014c8a0
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/memline.c
View File

@@ -1155,7 +1155,7 @@ ml_recover()
/*
* Allocate a buffer structure for the swap file that is used for recovery.
* Only the memline in it is really used.
* Only the memline and crypt information in it are really used.
*/
buf = (buf_T *)alloc((unsigned)sizeof(buf_T));
if (buf == NULL)
@@ -1188,6 +1188,7 @@ ml_recover()
#ifdef FEAT_CRYPT
mfp->mf_buffer = buf;
buf->b_p_key = empty_option;
buf->b_p_cm = empty_option;
#endif
/*
@@ -1685,6 +1686,7 @@ theend:
#ifdef FEAT_CRYPT
if (buf->b_p_key != curbuf->b_p_key)
free_string_option(buf->b_p_key);
free_string_option(buf->b_p_cm);
#endif
vim_free(buf->b_ml.ml_stack);
vim_free(buf);
@@ -4939,7 +4941,7 @@ ml_crypt_prepare(mfp, offset, reading)
#define MLCS_MINL 400 /* should be half of MLCS_MAXL */
/*
* Keep information for finding byte offset of a line, updtytpe may be one of:
* Keep information for finding byte offset of a line, updtype may be one of:
* ML_CHNK_ADDLINE: Add len to parent chunk, possibly splitting it
* Careful: ML_CHNK_ADDLINE may cause ml_find_line() to be called.
* ML_CHNK_DELLINE: Subtract len from parent chunk, possibly deleting it