Backport r5287 from trunk.

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

diff --git a/ChangeLog b/ChangeLog
index 0f2f9c6cc0aa5e663192342de21c8819c33ef322..2208116a562647799289de2b55ad7a64972ec1e1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-07-10  Benno Schulenberg  <bensberg@justemail.net>
+       * src/nano.c (delete_opennode): Plug a small memory leak.
+
 2015-06-28  Benno Schulenberg  <bensberg@justemail.net>
        * src/global.c (add_to_sclist), src/help.c (help_init), src/nano.h,
        src/rcfile.c (parse_binding): When defining the toggles, give each

diff --git a/src/files.c b/src/files.c
index fb47d944483089cca56909a33f2f579b865b94f8..ca8848ff762a88f58a309186fe3b8c3d7a398d56 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -224,7 +224,7 @@ int write_lockfile(const char *lockfilename, const char *origfilename, bool modi
        return -1;
     }
 
-    openfile->lock_filename = lockfilename;
+    openfile->lock_filename = (char *) lockfilename;
 
     return 1;
 }

diff --git a/src/nano.c b/src/nano.c
index e87caa87011c99b31fd15faa2fe6aeb5a092cdd9..7fc8a429a94e59e4d6bba434c43011a2bb6c752c 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -569,6 +569,7 @@ void delete_opennode(openfilestruct *fileptr)
     free_filestruct(fileptr->fileage);
 #ifndef NANO_TINY
     free(fileptr->current_stat);
+    free(fileptr->lock_filename);
 #endif
     free(fileptr);
 }

diff --git a/src/nano.h b/src/nano.h
index db7be93bd76a0b04d95134473b28ab1970706a0c..d3b98d87f73f12210cfa5220f64341200c7823d8 100644 (file)
--- a/src/nano.h
+++ b/src/nano.h
@@ -397,7 +397,7 @@ typedef struct openfilestruct {
     undo *current_undo;
        /* The current (i.e. next) level of undo. */
     undo_type last_action;
-    const char *lock_filename;
+    char *lock_filename;
        /* The path of the lockfile, if we created one. */
 #endif
 #ifndef DISABLE_COLOR