Mercurial > vim
diff src/viminfo.c @ 22029:2d6d70a913c1 v8.2.1564
patch 8.2.1564: a few remaining errors from ubsan
Commit: https://github.com/vim/vim/commit/4ad739fc053c1666d07ba1cf59be26cb1c3e52d7
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Sep 2 10:25:45 2020 +0200
patch 8.2.1564: a few remaining errors from ubsan
Problem: A few remaining errors from ubsan.
Solution: Avoid the warnings. (Dominique Pell?, closes https://github.com/vim/vim/issues/6837)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 02 Sep 2020 10:30:05 +0200 |
| parents | 93dae47699fb |
| children | 402f1d8653c1 |
line wrap: on
line diff
--- 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))