From f9fe903579033791e4233e8d55613634492702f5 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Thu, 1 Nov 2018 04:53:46 -0400 Subject: vim-patch:8.1.0501: cppcheck warns for using array index before bounds check (#9178) Problem: Cppcheck warns for using array index before bounds check. Solution: Swap the conditions. (Dominique Pelle) https://github.com/vim/vim/commit/a9a8e04eab106c1d21381f79f8965fe50b94e235 --- src/nvim/memline.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/nvim/memline.c b/src/nvim/memline.c index 9d1f542973..aad1750c85 100644 --- a/src/nvim/memline.c +++ b/src/nvim/memline.c @@ -3709,9 +3709,9 @@ static void ml_updatechunk(buf_T *buf, linenr_T line, long len, int updtype) curix++) { curline += buf->b_ml.ml_chunksize[curix].mlcs_numlines; } - } else if (line >= curline + buf->b_ml.ml_chunksize[curix].mlcs_numlines - && curix < buf->b_ml.ml_usedchunks - 1) { - /* Adjust cached curix & curline */ + } else if (curix < buf->b_ml.ml_usedchunks - 1 + && line >= curline + buf->b_ml.ml_chunksize[curix].mlcs_numlines) { + // Adjust cached curix & curline curline += buf->b_ml.ml_chunksize[curix].mlcs_numlines; curix++; } -- cgit