diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-09-02 10:25:45 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-09-02 10:25:45 +0200 |
| commit | 4ad739fc053c1666d07ba1cf59be26cb1c3e52d7 (patch) | |
| tree | 66485dc142df679ab7c8091c2e6f14c7bc9608cb | |
| parent | 6f84b6db10ab86bca85e33f3fc6ee735eec8bbe5 (diff) | |
patch 8.2.1564: a few remaining errors from ubsanv8.2.1564
Problem: A few remaining errors from ubsan.
Solution: Avoid the warnings. (Dominique Pellé, closes #6837)
| -rw-r--r-- | src/spellfile.c | 12 | ||||
| -rw-r--r-- | src/spellsuggest.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 | ||||
| -rw-r--r-- | src/viminfo.c | 3 |
4 files changed, 15 insertions, 8 deletions
diff --git a/src/spellfile.c b/src/spellfile.c index d5ec3feadd..12dedd6c57 100644 --- a/src/spellfile.c +++ b/src/spellfile.c @@ -816,11 +816,15 @@ read_cnt_string(FILE *fd, int cnt_bytes, int *cntp) // read the length bytes, MSB first for (i = 0; i < cnt_bytes; ++i) - cnt = (cnt << 8) + (unsigned)getc(fd); - if (cnt < 0) { - *cntp = SP_TRUNCERROR; - return NULL; + int c = getc(fd); + + if (c == EOF) + { + *cntp = SP_TRUNCERROR; + return NULL; + } + cnt = (cnt << 8) + (unsigned)c; } *cntp = cnt; if (cnt == 0) diff --git a/src/spellsuggest.c b/src/spellsuggest.c index 96e7bb634c..e2423cd98a 100644 --- a/src/spellsuggest.c +++ b/src/spellsuggest.c @@ -3731,9 +3731,6 @@ cleanup_suggestions( int maxscore, int keep) // nr of suggestions to keep { - suggest_T *stp = &SUG(*gap, 0); - int i; - if (gap->ga_len > 0) { // Sort the list. @@ -3744,6 +3741,9 @@ cleanup_suggestions( // displayed. if (gap->ga_len > keep) { + int i; + suggest_T *stp = &SUG(*gap, 0); + for (i = keep; i < gap->ga_len; ++i) vim_free(stp[i].st_word); gap->ga_len = keep; diff --git a/src/version.c b/src/version.c index d606f1ec92..03612aa067 100644 --- a/src/version.c +++ b/src/version.c @@ -755,6 +755,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1564, +/**/ 1563, /**/ 1562, diff --git a/src/viminfo.c b/src/viminfo.c index 74780c3d07..0ec9a13193 100644 --- a/src/viminfo.c +++ b/src/viminfo.c @@ -2183,7 +2183,8 @@ write_viminfo_filemarks(FILE *fp) xfmark_T *vi_fm; fm = idx >= 0 ? &curwin->w_jumplist[idx] : NULL; - vi_fm = vi_idx < vi_jumplist_len ? &vi_jumplist[vi_idx] : NULL; + vi_fm = (vi_jumplist != NULL && vi_idx < vi_jumplist_len) + ? &vi_jumplist[vi_idx] : NULL; if (fm == NULL && vi_fm == NULL) break; if (fm == NULL || (vi_fm != NULL && fm->time_set < vi_fm->time_set)) |