in copy_file(), assert that inn and out don't both point to the same

file

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

diff --git a/ChangeLog b/ChangeLog
index df25a170c10e24fe466e6331e609b3bc90625d5b..ff9a118b9bd339c66a688c993e3c772c9efdbd98 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,10 @@ CVS code -
          needle/rev_start is blank. (DLR)
        - Return char* instead of const char*. (DLR)
        - Simplify and rewrite to use strncasecmp(). (DLR)
+- files.c:
+  copy_file()
+       - Assert that inn and out don't both point to the same file.
+         (DLR)
 - prompt.c:
   do_yesno_prompt()
        - Remove redundant check for NO_HELP's being FALSE. (DLR)

diff --git a/src/files.c b/src/files.c
index 350c4362f666c4d1e32ab177b8773657fe796f0d..e75f651e967bb84567a892c8ef456a5b72ebdb96 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -1234,11 +1234,11 @@ void init_backup_dir(void)
  * on write error. */
 int copy_file(FILE *inn, FILE *out)
 {
+    int retval = 0;
     char buf[BUFSIZ];
     size_t charsread;
-    int retval = 0;
 
-    assert(inn != NULL && out != NULL);
+    assert(inn != NULL && out != NULL && inn != out);
 
     do {
        charsread = fread(buf, sizeof(char), BUFSIZ, inn);