diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-08-13 00:18:24 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-08-13 00:18:24 +0200 |
| commit | f077db24230d10ef9a66ae14da34b639464d8fa2 (patch) | |
| tree | f365575138586a2e3ee4f08817e7b87490735bca | |
| parent | 9570aacdb82c1eb5645d0fbc35bf9728d7334b23 (diff) | |
patch 8.1.1843: might be freeing memory that was not allocatedv8.1.1843
Problem: Might be freeing memory that was not allocated.
Solution: Have next_fenc() set the fenc_alloced flag. (closes #4804)
| -rw-r--r-- | src/fileio.c | 19 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 8 deletions
diff --git a/src/fileio.c b/src/fileio.c index bc0b15b914..e07b908671 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -27,7 +27,7 @@ /* Is there any system that doesn't have access()? */ #define USE_MCH_ACCESS -static char_u *next_fenc(char_u **pp); +static char_u *next_fenc(char_u **pp, int *alloced); #ifdef FEAT_EVAL static char_u *readfile_charconvert(char_u *fname, char_u *fenc, int *fdp); #endif @@ -890,8 +890,7 @@ readfile( else { fenc_next = p_fencs; /* try items in 'fileencodings' */ - fenc = next_fenc(&fenc_next); - fenc_alloced = TRUE; + fenc = next_fenc(&fenc_next, &fenc_alloced); } /* @@ -994,8 +993,7 @@ retry: vim_free(fenc); if (fenc_next != NULL) { - fenc = next_fenc(&fenc_next); - fenc_alloced = (fenc_next != NULL); + fenc = next_fenc(&fenc_next, &fenc_alloced); } else { @@ -2761,14 +2759,16 @@ set_forced_fenc(exarg_T *eap) * "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. + * 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) +next_fenc(char_u **pp, int *alloced) { char_u *p; char_u *r; + *alloced = FALSE; if (**pp == NUL) { *pp = NULL; @@ -2791,8 +2791,11 @@ next_fenc(char_u **pp) r = p; } } - if (r == NULL) /* out of memory */ + if (r != NULL) + *alloced = TRUE; + else { + // out of memory r = (char_u *)""; *pp = NULL; } diff --git a/src/version.c b/src/version.c index 568852bbd2..5741d5fdaa 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1843, +/**/ 1842, /**/ 1841, |