thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

Fix: editing a not encrypted file after a crypted file messed up reading the

Browse Source 
text from an undo file.
This commit is contained in:
Bram Moolenaar
2010-07-25 16:05:19 +02:00
parent 8d9b40e71a
commit fa0ff9aedf
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/undo.c
View File

@@ -888,7 +888,7 @@ read_string_decrypt(buf, fd, len)
ptr = read_string(fd, len);
#ifdef FEAT_CRYPT
if (ptr != NULL || *buf->b_p_key != NUL)
if (ptr != NULL && *buf->b_p_key != NUL)
crypt_decode(ptr, len);
#endif
return ptr;
@@ -909,7 +909,7 @@ serialize_header(fp, buf, hash)
/* If the buffer is encrypted then all text bytes following will be
* encrypted. Numbers and other info is not crypted. */
#ifdef FEAT_CRYPT
if (*buf->b_p_key)
if (*buf->b_p_key != NUL)
{
char_u *header;
int header_len;
@@ -1475,7 +1475,7 @@ u_write_undo(name, forceit, buf, hash)
if (serialize_header(fp, buf, hash) == FAIL)
goto write_error;
#ifdef FEAT_CRYPT
if (*buf->b_p_key)
if (*buf->b_p_key != NUL)
do_crypt = TRUE;
#endif