ariadne
/
smol
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Plugging three tiny memory leaks. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5520 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2016-01-02 16:01:04 +00:00
parent 46db638435
commit 9eca195990
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2016-01-02 Benno Schulenberg <bensberg@justemail.net>
* src/text.c (do_spell, do_formatter): Plug three tiny memory leaks.
2015-12-31 Benno Schulenberg <bensberg@justemail.net> 2015-12-31 Benno Schulenberg <bensberg@justemail.net>
* src/text.c (do_formatter): Restore the cursor position differently. * src/text.c (do_formatter): Restore the cursor position differently.
* src/search.c (do_gotopos): Delete this now unused function. * src/search.c (do_gotopos): Delete this now unused function.

20
src/text.c
View File

@ -2850,7 +2850,7 @@ void do_spell(void)
{ {
bool status; bool status;
FILE *temp_file; FILE *temp_file;
char *temp = safe_tempfile(&temp_file); char *temp;
const char *spell_msg; const char *spell_msg;
if (ISSET(RESTRICTED)) { if (ISSET(RESTRICTED)) {
@ -2858,6 +2858,8 @@ void do_spell(void)
return; return;
} }
temp = safe_tempfile(&temp_file);
if (temp == NULL) { if (temp == NULL) {
statusbar(_("Error writing temp file: %s"), strerror(errno)); statusbar(_("Error writing temp file: %s"), strerror(errno));
return; return;
@ -3234,7 +3236,7 @@ void do_formatter(void)
{ {
bool status; bool status;
FILE *temp_file; FILE *temp_file;
char *temp = safe_tempfile(&temp_file); char *temp;
int format_status; int format_status;
size_t current_x_save = openfile->current_x; size_t current_x_save = openfile->current_x;
size_t pww_save = openfile->placewewant; size_t pww_save = openfile->placewewant;
@ -3246,6 +3248,13 @@ void do_formatter(void)
static char **formatargs = NULL; static char **formatargs = NULL;
char *finalstatus = NULL; char *finalstatus = NULL;
if (openfile->totsize == 0) {
statusbar(_("Finished"));
return;
}
temp = safe_tempfile(&temp_file);
if (temp == NULL) { if (temp == NULL) {
statusbar(_("Error writing temp file: %s"), strerror(errno)); statusbar(_("Error writing temp file: %s"), strerror(errno));
return; return;
@ -3261,11 +3270,6 @@ void do_formatter(void)
return; return;
} }
if (openfile->totsize == 0) {
statusbar(_("Finished"));
return;
}
blank_bottombars(); blank_bottombars();
statusbar(_("Invoking formatter, please wait")); statusbar(_("Invoking formatter, please wait"));
doupdate(); doupdate();
@ -3299,6 +3303,8 @@ void do_formatter(void)
/* If we couldn't fork, get out. */ /* If we couldn't fork, get out. */
if (pid_format < 0) { if (pid_format < 0) {
statusbar(_("Could not fork")); statusbar(_("Could not fork"));
unlink(temp);
free(temp);
return; return;
} }