Merge #12827 'vim-patch:8.2.{1554,1561,1564,1565,1566}'

4 files changed, 20 insertions, 11 deletions

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 61a85171e8..697d283cca 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -1389,6 +1389,10 @@ static void foldMarkAdjustRecurse(
   linenr_T last;
   linenr_T top;
 
+  if (gap->ga_len == 0) {
+    return;
+  }
+
   /* In Insert mode an inserted line at the top of a fold is considered part
    * of the fold, otherwise it isn't. */
   if ((State & INSERT) && amount == (linenr_T)1 && line2 == MAXLNUM)
@@ -2738,7 +2742,8 @@ static void truncate_fold(win_T *const wp, fold_T *fp, linenr_T end)
 }
 
 #define FOLD_END(fp) ((fp)->fd_top + (fp)->fd_len - 1)
-#define VALID_FOLD(fp, gap) ((fp) < ((fold_T *)(gap)->ga_data + (gap)->ga_len))
+#define VALID_FOLD(fp, gap) \
+  ((gap)->ga_len > 0 && (fp) < ((fold_T *)(gap)->ga_data + (gap)->ga_len))
 #define FOLD_INDEX(fp, gap) ((size_t)(fp - ((fold_T *)(gap)->ga_data)))
 void foldMoveRange(
     win_T *const wp, garray_T *gap,
diff --git a/src/nvim/spell.c b/src/nvim/spell.c
index 95948dac78..ad235f1f14 100644
--- a/src/nvim/spell.c
+++ b/src/nvim/spell.c
@@ -5765,14 +5765,14 @@ cleanup_suggestions (
 )
   FUNC_ATTR_NONNULL_ALL
 {
-  suggest_T   *stp = &SUG(*gap, 0);
-
   if (gap->ga_len > 0) {
     // Sort the list.
     qsort(gap->ga_data, (size_t)gap->ga_len, sizeof(suggest_T), sug_compare);
 
     // Truncate the list to the number of suggestions that will be displayed.
     if (gap->ga_len > keep) {
+      suggest_T *const stp = &SUG(*gap, 0);
+
       for (int i = keep; i < gap->ga_len; i++) {
         xfree(stp[i].st_word);
       }
diff --git a/src/nvim/spellfile.c b/src/nvim/spellfile.c
index a7d26e2a8e..09d8646c6d 100644
--- a/src/nvim/spellfile.c
+++ b/src/nvim/spellfile.c
@@ -984,15 +984,17 @@ nextone:
 static char_u *read_cnt_string(FILE *fd, int cnt_bytes, int *cntp)
 {
   int cnt = 0;
-  int i;
   char_u      *str;
 
   // read the length bytes, MSB first
-  for (i = 0; i < cnt_bytes; ++i)
-    cnt = (cnt << 8) + getc(fd);
-  if (cnt < 0) {
-    *cntp = SP_TRUNCERROR;
-    return NULL;
+  for (int i = 0; i < cnt_bytes; i++) {
+    const int c = getc(fd);
+
+    if (c == EOF) {
+      *cntp = SP_TRUNCERROR;
+      return NULL;
+    }
+    cnt = (cnt << 8) + (unsigned)c;
   }
   *cntp = cnt;
   if (cnt == 0)
@@ -3038,9 +3040,9 @@ static int spell_read_dic(spellinfo_T *spin, char_u *fname, afffile_T *affile)
   spin->si_msg_count = 999999;
 
   // Read and ignore the first line: word count.
-  (void)vim_fgets(line, MAXLINELEN, fd);
-  if (!ascii_isdigit(*skipwhite(line)))
+  if (vim_fgets(line, MAXLINELEN, fd) || !ascii_isdigit(*skipwhite(line))) {
     EMSG2(_("E760: No word count in %s"), fname);
+  }
 
   // Read all the lines in the file one by one.
   // The words are converted to 'encoding' here, before being added to
diff --git a/src/nvim/testdir/test_filetype.vim b/src/nvim/testdir/test_filetype.vim
index 529f237a97..617e3dfe41 100644
--- a/src/nvim/testdir/test_filetype.vim
+++ b/src/nvim/testdir/test_filetype.vim
@@ -75,6 +75,7 @@ let s:filename_checks = {
     \ 'ave': ['file.ave'],
     \ 'awk': ['file.awk', 'file.gawk'],
     \ 'b': ['file.mch', 'file.ref', 'file.imp'],
+    \ 'bzl': ['file.bazel', 'file.bzl', 'WORKSPACE'],
     \ 'bc': ['file.bc'],
     \ 'bdf': ['file.bdf'],
     \ 'bib': ['file.bib'],
@@ -526,6 +527,7 @@ let s:filename_checks = {
 
 let s:filename_case_checks = {
     \ 'modula2': ['file.DEF', 'file.MOD'],
+    \ 'bzl': ['file.BUILD', 'BUILD'],
     \ }
 
 func CheckItems(checks)