commit 4ad739fc053c1666d07ba1cf59be26cb1c3e52d7
author Bram Moolenaar <Bram@vim.org> Wed Sep 02 10:25:45 2020 +0200
committer Bram Moolenaar <Bram@vim.org> Wed Sep 02 10:25:45 2020 +0200
tree 66485dc142df679ab7c8091c2e6f14c7bc9608cb
parent 6f84b6db10ab86bca85e33f3fc6ee735eec8bbe5

patch 8.2.1564: a few remaining errors from ubsan

Problem:    A few remaining errors from ubsan.
Solution:   Avoid the warnings. (Dominique Pellé, closes #6837)

src/viminfo.c

diff --git a/src/viminfo.c b/src/viminfo.c
index 74780c3..0ec9a13 100644
--- a/src/viminfo.c
+++ b/src/viminfo.c
@@ -2183,7 +2183,8 @@
 	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))