patch 7.4.1576
Problem: Write error of viminfo file is not handled properly. (Christian
Neukirchen)
Solution: Check the return value of fclose(). (closes #682)
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index ae88cc6..8a763c9 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -2065,26 +2065,30 @@
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)
+ if (viminfo_errcnt == 0)
{
- ++viminfo_errcnt;
- EMSG2(_("E886: Can't rename viminfo file to %s!"), fname);
+ 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: