Backport r5352 from trunk.

git-svn-id: svn://svn.savannah.gnu.org/nano/branches/nano_2_4_branch@5414 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index cc98a42136e50759d79b975e6befd59d28066fc0..4bbc413068f108da8ce3724aa3363302a10390f2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-11  Benno Schulenberg  <bensberg@justemail.net>
+       * src/files.c (write_file): Avoid calling copy_file() with a null
+       pointer.  Found with cppcheck.
+
 2015-08-08  Benno Schulenberg  <bensberg@justemail.net>
        * src/winio.c (display_string): For some reason the reallocation done
        by null_at() messes things up.  So put in the null byte "manually".

diff --git a/src/files.c b/src/files.c
index 5229de682588064eaaca9e5af1a0c76cb92c3553..85bb006a3f88f85f49fc4fc93cef9c2db203f025 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -2016,7 +2016,7 @@ bool write_file(const char *name, FILE *f_open, bool tmp, append_type
            }
        }
 
-       if (copy_file(f_source, f) != 0) {
+       if (f_source == NULL || copy_file(f_source, f) != 0) {
            statusbar(_("Error writing %s: %s"), tempname,
                strerror(errno));
            unlink(tempname);