Mercurial > vim
changeset 8573:c76cb97073bd v7.4.1576
commit https://github.com/vim/vim/commit/927030af23982a70580178e32806cd3638ce6e5b
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Mar 15 18:23:55 2016 +0100
patch 7.4.1576
Problem: Write error of viminfo file is not handled properly. (Christian
Neukirchen)
Solution: Check the return value of fclose(). (closes https://github.com/vim/vim/issues/682)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Tue, 15 Mar 2016 18:30:08 +0100 |
| parents | 3a9940e5a43c |
| children | a192274c1ac6 |
| files | src/ex_cmds.c src/version.c |
| diffstat | 2 files changed, 17 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_cmds.c +++ b/src/ex_cmds.c @@ -2065,26 +2065,30 @@ write_viminfo(char_u *file, int forceit) viminfo_errcnt = 0; do_viminfo(fp_in, fp_out, forceit ? 0 : (VIF_WANT_INFO | VIF_WANT_MARKS)); - fclose(fp_out); /* errors are ignored !? */ + if (fclose(fp_out) == EOF) + ++viminfo_errcnt; + if (fp_in != NULL) { fclose(fp_in); /* In case of an error keep the original viminfo file. Otherwise * rename the newly written file. Give an error if that fails. */ - if (viminfo_errcnt == 0 && vim_rename(tempname, fname) == -1) - { - ++viminfo_errcnt; - EMSG2(_("E886: Can't rename viminfo file to %s!"), fname); + if (viminfo_errcnt == 0) + { + if (vim_rename(tempname, fname) == -1) + { + ++viminfo_errcnt; + EMSG2(_("E886: Can't rename viminfo file to %s!"), fname); + } +# ifdef WIN3264 + /* If the viminfo file was hidden then also hide the new file. */ + else if (hidden) + mch_hide(fname); +# endif } if (viminfo_errcnt > 0) mch_remove(tempname); - -#ifdef WIN3264 - /* If the viminfo file was hidden then also hide the new file. */ - if (hidden) - mch_hide(fname); -#endif } end: