From 3d2784e1138cb10635f013751c7a4d32cf957d39 Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Mon, 3 Aug 2015 08:03:22 +0000 Subject: [PATCH] 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 --- ChangeLog | 4 ++++ src/rcfile.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6274f602..590f3636 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-08-03 Benno Schulenberg + * 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 * src/files.c (initialize_buffer): Initialize also openfile->syntax. This addresses Debian bug #787914 reported by Paul Wise. diff --git a/src/rcfile.c b/src/rcfile.c index 2f933233..da7b32cf 100644 --- a/src/rcfile.c +++ b/src/rcfile.c @@ -564,7 +564,7 @@ void parse_binding(char *ptr, bool dobind) /* If this is a toggle, copy its sequence number. */ if (newsc->scfunc == do_toggle_void) { 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; } else newsc->ordinal = 0; -- 2.39.5