Backport r5287 from trunk.

git-svn-id: svn://svn.savannah.gnu.org/nano/branches/nano_2_4_branch@5407 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Chris Allegretta 2015-11-15 06:10:04 +00:00
parent 55a2133817
commit 9f613bc739
4 changed files with 6 additions and 2 deletions

View File

@ -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

View File

@ -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;
}

View File

@ -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);
}

View File

@ -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