mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-28 22:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:8.2.3777: spell file write error not checked

Browse Source 
Problem:    Spell file write error not checked.
Solution:   Check writing the prefix conditions. (Björn Linse, closes vim/vim#9323)
This commit is contained in:
Björn Linse
2021-12-10 23:11:48 +01:00
parent 22d7dd2aec
commit d23a5da890
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nvim/spellfile.c
View File

@@ -4447,10 +4447,10 @@ static int write_vim_spell(spellinfo_T *spin, char_u *fname)
putc(SN_PREFCOND, fd); // <sectionID> putc(SN_PREFCOND, fd); // <sectionID>
putc(SNF_REQUIRED, fd); // <sectionflags> putc(SNF_REQUIRED, fd); // <sectionflags>
size_t l = (size_t)write_spell_prefcond(NULL, &spin->si_prefcond); size_t l = (size_t)write_spell_prefcond(NULL, &spin->si_prefcond, &fwv);
put_bytes(fd, l, 4); // <sectionlen> put_bytes(fd, l, 4); // <sectionlen>
write_spell_prefcond(fd, &spin->si_prefcond); write_spell_prefcond(fd, &spin->si_prefcond, &fwv);
} }
// SN_REP: <repcount> <rep> ... // SN_REP: <repcount> <rep> ...
@@ -5794,7 +5794,7 @@ static int set_spell_finish(spelltab_T *new_st)
// Write the table with prefix conditions to the .spl file. // Write the table with prefix conditions to the .spl file.
// When "fd" is NULL only count the length of what is written. // When "fd" is NULL only count the length of what is written.
static int write_spell_prefcond(FILE *fd, garray_T *gap) static int write_spell_prefcond(FILE *fd, garray_T *gap, size_t *fwv)
{ {
assert(gap->ga_len >= 0); assert(gap->ga_len >= 0);
@@ -5802,8 +5802,7 @@ static int write_spell_prefcond(FILE *fd, garray_T *gap)
put_bytes(fd, (uintmax_t)gap->ga_len, 2); // <prefcondcnt> put_bytes(fd, (uintmax_t)gap->ga_len, 2); // <prefcondcnt>
} }
size_t totlen = 2 + (size_t)gap->ga_len; // <prefcondcnt> and <condlen> bytes size_t totlen = 2 + (size_t)gap->ga_len; // <prefcondcnt> and <condlen> bytes
size_t x = 1; // collect return value of fwrite() for (int i = 0; i < gap->ga_len; i++) {
for (int i = 0; i < gap->ga_len; ++i) {
// <prefcond> : <condlen> <condstr> // <prefcond> : <condlen> <condstr>
char_u *p = ((char_u **)gap->ga_data)[i]; char_u *p = ((char_u **)gap->ga_data)[i];
if (p != NULL) { if (p != NULL) {
@@ -5811,7 +5810,7 @@ static int write_spell_prefcond(FILE *fd, garray_T *gap)
if (fd != NULL) { if (fd != NULL) {
assert(len <= INT_MAX); assert(len <= INT_MAX);
fputc((int)len, fd); fputc((int)len, fd);
x &= fwrite(p, len, 1, fd); *fwv &= fwrite(p, len, 1, fd);
} }
totlen += len; totlen += len;
} else if (fd != NULL) { } else if (fd != NULL) {