aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.0.0988: warning from Covscan about using NULL pointer

Browse Source 
Problem:    Warning from Covscan about using NULL pointer.
Solution:   Add extra check for NULL. (zdohnal)
This commit is contained in:
Bram Moolenaar 2017-08-23 22:32:35 +02:00
parent d2c45a1964
commit 829aa64cf5
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/fileio.c
View File

@ -1370,7 +1370,8 @@ retry:
* Decrypt the read bytes. This is done before checking for * Decrypt the read bytes. This is done before checking for
* EOF because the crypt layer may be buffering. * EOF because the crypt layer may be buffering.
*/ */
if (cryptkey != NULL && size > 0) if (cryptkey != NULL && curbuf->b_cryptstate != NULL
&& size > 0)
{ {
if (crypt_works_inplace(curbuf->b_cryptstate)) if (crypt_works_inplace(curbuf->b_cryptstate))
{ {

2
src/undo.c
View File

@ -921,7 +921,7 @@ undo_write(bufinfo_T *bi, char_u *ptr, size_t len)
static int static int
undo_flush(bufinfo_T *bi) undo_flush(bufinfo_T *bi)
{ {
if (bi->bi_buffer != NULL && bi->bi_used > 0) if (bi->bi_buffer != NULL && bi->bi_state != NULL && bi->bi_used > 0)
{ {
crypt_encode_inplace(bi->bi_state, bi->bi_buffer, bi->bi_used); crypt_encode_inplace(bi->bi_state, bi->bi_buffer, bi->bi_used);
if (fwrite(bi->bi_buffer, bi->bi_used, (size_t)1, bi->bi_fp) != 1) if (fwrite(bi->bi_buffer, bi->bi_used, (size_t)1, bi->bi_fp) != 1)

2
src/version.c
View File

@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
988,
/**/ /**/
987, 987,
/**/ /**/