diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-06-30 00:31:39 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-07-04 10:05:35 -0400 |
| commit | 9f73715daa3ef849ea89b44b7118fd0cd16fef55 (patch) | |
| tree | 41f55d16c541d652f3ab93b712334d00ce2ee179 /src/nvim/spellfile.c | |
| parent | e84c075ad9a8ce1bf5182bd0d4993cd2304cf9e1 (diff) | |
| download | rneovim-9f73715daa3ef849ea89b44b7118fd0cd16fef55.tar.gz rneovim-9f73715daa3ef849ea89b44b7118fd0cd16fef55.tar.bz2 rneovim-9f73715daa3ef849ea89b44b7118fd0cd16fef55.zip | |
vim-patch:8.2.1089: Coverity warns for pointer computation
Problem: Coverity warns for pointer computation.
Solution: Avoid computing a pointer to invalid memory.
https://github.com/vim/vim/commit/927b7dd0fe9a0a82b39d600779edb4390ecdeda6
Diffstat (limited to 'src/nvim/spellfile.c')
| -rw-r--r-- | src/nvim/spellfile.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/nvim/spellfile.c b/src/nvim/spellfile.c index f8c10d0258..41669789db 100644 --- a/src/nvim/spellfile.c +++ b/src/nvim/spellfile.c @@ -5095,7 +5095,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 = xmalloc(MAXPATHL); @@ -5105,12 +5106,10 @@ mkspell ( if (fcount == 1 && len > 4 && STRCMP(fnames[0] + len - 4, ".add") == 0) { // 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()); |