Mercurial > vim

diff src/spellfile.c @ 21075:969d389a2e36 v8.2.1089

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.1089: Coverity warns for pointer computation Commit: https://github.com/vim/vim/commit/927b7dd0fe9a0a82b39d600779edb4390ecdeda6 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jun 29 22:24:56 2020 +0200 patch 8.2.1089: Coverity warns for pointer computation Problem: Coverity warns for pointer computation. Solution: Avoid computing a pointer to invalid memory.
author Bram Moolenaar <Bram@vim.org>
date Mon, 29 Jun 2020 22:30:04 +0200
parents 3a9dcfe62691
children 32f85b7d6504
line wrap: on
line diff
--- a/src/spellfile.c
+++ b/src/spellfile.c
@@ -5908,7 +5908,8 @@ mkspell(
     spin.si_newcompID = 127;	// start compound ID at first maximum
 
     // default: fnames[0] is output file, following are input files
-    innames = &fnames[1];
+    // When "fcount" is 1 there is only one file.
+    innames = &fnames[fcount == 1 ? 0 : 1];
     incount = fcount - 1;
 
     wfname = alloc(MAXPATHL);
@@ -5922,14 +5923,12 @@ mkspell(
 	{
 	    // For ":mkspell path/en.latin1.add" output file is
 	    // "path/en.latin1.add.spl".
-	    innames = &fnames[0];
 	    incount = 1;
 	    vim_snprintf((char *)wfname, MAXPATHL, "%s.spl", fnames[0]);
 	}
 	else if (fcount == 1)
 	{
 	    // For ":mkspell path/vim" output file is "path/vim.latin1.spl".
-	    innames = &fnames[0];
 	    incount = 1;
 	    vim_snprintf((char *)wfname, MAXPATHL, SPL_FNAME_TMPL,
 		  fnames[0], spin.si_ascii ? (char_u *)"ascii" : spell_enc());