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

Plugging a tiny leak. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5341 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2015-08-03 19:52:48 +00:00
parent 455fb4f063
commit 95e1f55574
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -2,6 +2,7 @@
* src/rcfile.c (parse_binding): Check the value of shortcut->toggle * src/rcfile.c (parse_binding): Check the value of shortcut->toggle
only if it actually is a toggle. Found with valgrind. only if it actually is a toggle. Found with valgrind.
* src/files.c (write_lockfile): Plug a leak. Found with valgrind. * src/files.c (write_lockfile): Plug a leak. Found with valgrind.
* src/rcfile.c (parse_binding): Plug a tiny leak.
2015-08-02 Benno Schulenberg <bensberg@justemail.net> 2015-08-02 Benno Schulenberg <bensberg@justemail.net>
* src/files.c (initialize_buffer): Initialize also openfile->syntax. * src/files.c (initialize_buffer): Initialize also openfile->syntax.

25
src/rcfile.c
View File

@ -444,7 +444,7 @@ void parse_binding(char *ptr, bool dobind)
if (strlen(keycopy) < 2) { if (strlen(keycopy) < 2) {
rcfile_error(N_("Key name is too short")); rcfile_error(N_("Key name is too short"));
return; goto free_copy;
} }
/* Uppercase only the first two or three characters of the key name. */ /* Uppercase only the first two or three characters of the key name. */
@ -455,7 +455,7 @@ void parse_binding(char *ptr, bool dobind)
keycopy[2] = toupper(keycopy[2]); keycopy[2] = toupper(keycopy[2]);
else { else {
rcfile_error(N_("Key name is too short")); rcfile_error(N_("Key name is too short"));
return; goto free_copy;
} }
} }
@ -465,7 +465,7 @@ void parse_binding(char *ptr, bool dobind)
keycopy[1] = tolower(keycopy[1]); keycopy[1] = tolower(keycopy[1]);
else if (keycopy[0] != '^' && keycopy[0] != 'M' && keycopy[0] != 'F') { else if (keycopy[0] != '^' && keycopy[0] != 'M' && keycopy[0] != 'F') {
rcfile_error(N_("Key name must begin with \"^\", \"M\", or \"F\"")); rcfile_error(N_("Key name must begin with \"^\", \"M\", or \"F\""));
return; goto free_copy;
} }
if (dobind) { if (dobind) {
@ -474,7 +474,7 @@ void parse_binding(char *ptr, bool dobind)
if (funcptr[0] == '\0') { if (funcptr[0] == '\0') {
rcfile_error(N_("Must specify a function to bind the key to")); rcfile_error(N_("Must specify a function to bind the key to"));
return; goto free_copy;
} }
} }
@ -484,21 +484,21 @@ void parse_binding(char *ptr, bool dobind)
if (menuptr[0] == '\0') { if (menuptr[0] == '\0') {
/* TRANSLATORS: Do not translate the word "all". */ /* TRANSLATORS: Do not translate the word "all". */
rcfile_error(N_("Must specify a menu (or \"all\") in which to bind/unbind the key")); rcfile_error(N_("Must specify a menu (or \"all\") in which to bind/unbind the key"));
return; goto free_copy;
} }
if (dobind) { if (dobind) {
newsc = strtosc(funcptr); newsc = strtosc(funcptr);
if (newsc == NULL) { if (newsc == NULL) {
rcfile_error(N_("Cannot map name \"%s\" to a function"), funcptr); rcfile_error(N_("Cannot map name \"%s\" to a function"), funcptr);
return; goto free_copy;
} }
} }
menu = strtomenu(menuptr); menu = strtomenu(menuptr);
if (menu < 1) { if (menu < 1) {
rcfile_error(N_("Cannot map name \"%s\" to a menu"), menuptr); rcfile_error(N_("Cannot map name \"%s\" to a menu"), menuptr);
return; goto free_copy;
} }
#ifdef DEBUG #ifdef DEBUG
@ -531,7 +531,7 @@ void parse_binding(char *ptr, bool dobind)
if (!menu) { if (!menu) {
rcfile_error(N_("Function '%s' does not exist in menu '%s'"), funcptr, menuptr); rcfile_error(N_("Function '%s' does not exist in menu '%s'"), funcptr, menuptr);
free(newsc); free(newsc);
return; goto free_copy;
} }
newsc->keystr = keycopy; newsc->keystr = keycopy;
@ -546,7 +546,7 @@ void parse_binding(char *ptr, bool dobind)
if (check_bad_binding(newsc)) { if (check_bad_binding(newsc)) {
rcfile_error(N_("Sorry, keystroke \"%s\" may not be rebound"), newsc->keystr); rcfile_error(N_("Sorry, keystroke \"%s\" may not be rebound"), newsc->keystr);
free(newsc); free(newsc);
return; goto free_copy;
} }
} }
@ -571,8 +571,11 @@ void parse_binding(char *ptr, bool dobind)
/* Add the new shortcut at the start of the list. */ /* Add the new shortcut at the start of the list. */
newsc->next = sclist; newsc->next = sclist;
sclist = newsc; sclist = newsc;
} else return;
free(keycopy); }
free_copy:
free(keycopy);
} }