opensourcemirror
/
neovim
mirror of https://github.com/neovim/neovim.git
1
0
Fork 0
Code Issues Releases Wiki Activity

vim-patch:8.1.1843: might be freeing memory that was not allocated (#10756) 

Problem:    Might be freeing memory that was not allocated.
Solution:   Have next_fenc() set the fenc_alloced flag. (closes vim/vim#4804)
f077db2423
This commit is contained in:
Jan Edmund Lazo 2019-08-13 10:46:26 -04:00 committed by Daniel Hahler
parent 90e44ecf11
commit 5e1acd412b
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/nvim/fileio.c
View File

@ -777,9 +777,8 @@ readfile(
fenc = curbuf->b_p_fenc; // use format from buffer
fenc_alloced = false;
} else {
fenc_next = p_fencs; /* try items in 'fileencodings' */
fenc = next_fenc(&fenc_next);
fenc_alloced = true;
fenc_next = p_fencs; // try items in 'fileencodings'
fenc = next_fenc(&fenc_next, &fenc_alloced);
}
/*
@ -869,8 +868,7 @@ retry:
if (fenc_alloced)
xfree(fenc);
if (fenc_next != NULL) {
fenc = next_fenc(&fenc_next);
fenc_alloced = (fenc_next != NULL);
fenc = next_fenc(&fenc_next, &fenc_alloced);
} else {
fenc = (char_u *)"";
fenc_alloced = false;
@ -2082,19 +2080,19 @@ void set_forced_fenc(exarg_T *eap)
}
}
/*
* Find next fileencoding to use from 'fileencodings'.
* "pp" points to fenc_next. It's advanced to the next item.
* When there are no more items, an empty string is returned and *pp is set to
* NULL.
* When *pp is not set to NULL, the result is in allocated memory.
*/
static char_u *next_fenc(char_u **pp)
// Find next fileencoding to use from 'fileencodings'.
// "pp" points to fenc_next. It's advanced to the next item.
// When there are no more items, an empty string is returned and *pp is set to
// NULL.
// When *pp is not set to NULL, the result is in allocated memory and "alloced"
// is set to true.
static char_u *next_fenc(char_u **pp, bool *alloced)
FUNC_ATTR_NONNULL_ALL FUNC_ATTR_NONNULL_RET
{
char_u *p;
char_u *r;
*alloced = false;
if (**pp == NUL) {
*pp = NULL;
return (char_u *)"";
@ -2110,6 +2108,7 @@ static char_u *next_fenc(char_u **pp)
xfree(r);
r = p;
}
*alloced = true;
return r;
}