Permalink
Browse files

patch 8.0.0636: when reading the undo file fails may use uninitialize…

…d data

Problem:    When reading the undo file fails may use uninitialized data.
Solution:   Always clear the buffer on failure.
  • Loading branch information...
brammool committed Jun 11, 2017
1 parent 3a429ef commit 56f2db562ddc6c69026d55360f0cfaacd8adc26a
Showing with 14 additions and 7 deletions.
  1. +12 −7 src/undo.c
  2. +2 −0 src/version.c
View
@@ -1063,6 +1063,8 @@ undo_read_time(bufinfo_T *bi)
static int
undo_read(bufinfo_T *bi, char_u *buffer, size_t size)
{
int retval = OK;
#ifdef FEAT_CRYPT
if (bi->bi_buffer != NULL)
{
@@ -1078,10 +1080,8 @@ undo_read(bufinfo_T *bi, char_u *buffer, size_t size)
n = fread(bi->bi_buffer, 1, (size_t)CRYPT_BUF_SIZE, bi->bi_fp);
if (n == 0)
{
/* Error may be checked for only later. Fill with zeros,
* so that the reader won't use garbage. */
vim_memset(p, 0, size_todo);
return FAIL;
retval = FAIL;
break;
}
bi->bi_avail = n;
bi->bi_used = 0;
@@ -1095,12 +1095,17 @@ undo_read(bufinfo_T *bi, char_u *buffer, size_t size)
size_todo -= (int)n;
p += n;
}
return OK;
}
else
#endif
if (fread(buffer, (size_t)size, 1, bi->bi_fp) != 1)
return FAIL;
return OK;
retval = FAIL;
if (retval == FAIL)
/* Error may be checked for only later. Fill with zeros,
* so that the reader won't use garbage. */
vim_memset(buffer, 0, size);
return retval;
}
/*
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
636,
/**/
635,
/**/

0 comments on commit 56f2db5

Please sign in to comment.