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

Checking the value of shortcut->toggle only if it actually is a toggle. 

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5339 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
Benno Schulenberg 2015-08-03 08:03:22 +00:00
parent 8a06dfa4d7
commit 3d2784e113
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2015-08-03 Benno Schulenberg <bensberg@justemail.net>
* src/rcfile.c (parse_binding): Check value of shortcut->toggle
only if it actually is a toggle. Found with valgrind.
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.
This addresses Debian bug #787914 reported by Paul Wise. This addresses Debian bug #787914 reported by Paul Wise.

2
src/rcfile.c
View File

@ -564,7 +564,7 @@ void parse_binding(char *ptr, bool dobind)
/* If this is a toggle, copy its sequence number. */ /* If this is a toggle, copy its sequence number. */
if (newsc->scfunc == do_toggle_void) { if (newsc->scfunc == do_toggle_void) {
for (s = sclist; s != NULL; s = s->next) for (s = sclist; s != NULL; s = s->next)
if (newsc->toggle == s->toggle) if (s->scfunc == do_toggle_void && s->toggle == newsc->toggle)
newsc->ordinal = s->ordinal; newsc->ordinal = s->ordinal;
} else } else
newsc->ordinal = 0; newsc->ordinal = 0;