diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-10-30 22:15:55 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-10-30 22:15:55 +0100 |
| commit | a9a8e04eab106c1d21381f79f8965fe50b94e235 (patch) | |
| tree | 4a1113804e104fe24a8a545ad10cedc539f584a5 | |
| parent | 833e5dab143034b7e43bc0be49b2eb3687ff9ab7 (diff) | |
patch 8.1.0501: cppcheck warns for using array index before bounds checkv8.1.0501
Problem: Cppcheck warns for using array index before bounds check.
Solution: Swap the conditions. (Dominique Pelle)
| -rw-r--r-- | src/memline.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/memline.c b/src/memline.c index 9789349faf..1d65a44d8f 100644 --- a/src/memline.c +++ b/src/memline.c @@ -5029,8 +5029,8 @@ ml_updatechunk( 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) + 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; diff --git a/src/version.c b/src/version.c index 9d700e2ba3..73d06215ff 100644 --- a/src/version.c +++ b/src/version.c @@ -793,6 +793,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 501, +/**/ 500, /**/ 499, |