neovim

commit 9b03385d85424345c903f52366c604fa6db73e65
parent fafc329bbd1e15f9ab595568e8cd8b10295113dd
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Sat, 11 Oct 2025 10:47:11 +0800

Merge pull request #36118 from janlazo/vim-8.2.5017

vim-patch:8.2.{2456,4772,5017}
Diffstat:
M
src/nvim/errors.h
 | 
1
+
M
src/nvim/eval/userfunc.c
 | 
2
+-
M
src/nvim/eval/vars.c
 | 
2
+-
M
src/nvim/main.c
 | 
2
+-
M
src/nvim/os/shell.c
 | 
17
+++++++++++------

5 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/nvim/errors.h b/src/nvim/errors.h
@@ -198,6 +198,7 @@ EXTERN const char e_failed_to_find_all_diff_anchors[] INIT( = N_("E1550: Failed 
 EXTERN const char e_diff_anchors_with_hidden_windows[] INIT( = N_("E1562: Diff anchors cannot be used with hidden diff windows"));
 
 EXTERN const char e_trustfile[] INIT(= N_("E5570: Cannot update trust file: %s"));
+EXTERN const char e_cannot_read_from_str_2[] INIT(= N_("E282: Cannot read from \"%s\""));
 
 EXTERN const char e_unknown_option2[] INIT(= N_("E355: Unknown option: %s"));
 
diff --git a/src/nvim/eval/userfunc.c b/src/nvim/eval/userfunc.c
@@ -281,7 +281,7 @@ static ufunc_T *alloc_ufunc(const char *name, size_t namelen)
 {
   size_t len = offsetof(ufunc_T, uf_name) + namelen + 1;
   ufunc_T *fp = xcalloc(1, len);
-  STRCPY(fp->uf_name, name);
+  xmemcpyz(fp->uf_name, name, namelen);
   fp->uf_namelen = namelen;
 
   if ((uint8_t)name[0] == K_SPECIAL) {
diff --git a/src/nvim/eval/vars.c b/src/nvim/eval/vars.c
@@ -1369,7 +1369,7 @@ static void tv_list_unlet_range(list_T *const l, listitem_T *const li_first, con
 int do_unlet(const char *const name, const size_t name_len, const bool forceit)
   FUNC_ATTR_NONNULL_ALL
 {
-  const char *varname;
+  const char *varname = NULL;  // init to shut up gcc
   dict_T *dict;
   hashtab_T *ht = find_var_ht_dict(name, name_len, &varname, &dict);
 
diff --git a/src/nvim/main.c b/src/nvim/main.c
@@ -2143,7 +2143,7 @@ static void source_startup_scripts(const mparm_T *const parmp)
       // Do nothing.
     } else {
       if (do_source(parmp->use_vimrc, false, DOSO_NONE, NULL) != OK) {
-        semsg(_("E282: Cannot read from \"%s\""), parmp->use_vimrc);
+        semsg(_(e_cannot_read_from_str_2), parmp->use_vimrc);
       }
     }
   } else if (!silent_mode) {
diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c
@@ -789,15 +789,20 @@ char *get_cmd_output(char *cmd, char *infile, int flags, size_t *ret_len)
   // read the names from the file into memory
   FILE *fd = os_fopen(tempname, READBIN);
 
-  if (fd == NULL) {
-    semsg(_(e_notopen), tempname);
+  // Not being able to seek means we can't read the file.
+  long len_l;
+  if (fd == NULL
+      || fseek(fd, 0L, SEEK_END) == -1
+      || (len_l = ftell(fd)) == -1         // get size of temp file
+      || fseek(fd, 0L, SEEK_SET) == -1) {  // back to the start
+    semsg(_(e_cannot_read_from_str_2), tempname);
+    if (fd != NULL) {
+      fclose(fd);
+    }
     goto done;
   }
 
-  fseek(fd, 0, SEEK_END);
-  size_t len = (size_t)ftell(fd);  // get size of temp file
-  fseek(fd, 0, SEEK_SET);
-
+  size_t len = (size_t)len_l;
   buffer = xmalloc(len + 1);
   size_t i = fread(buffer, 1, len, fd);
   fclose(fd);