diff --git a/ChangeLog b/ChangeLog index 92daa052..9967b4fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2014-04-05 Mike Frysinger + * src/nano.c (do_input): Reload possibly freed function pointer. + 2014-04-04 Benno Schulenberg * src/{files.c,nano.c}: Avoid two more compilation warnings. * configure.ac: Allow --enable-extra and --enable-multibuffer diff --git a/src/nano.c b/src/nano.c index 00ccbf58..a40a01a6 100644 --- a/src/nano.c +++ b/src/nano.c @@ -1675,6 +1675,9 @@ int do_input(bool *meta_key, bool *func_key, bool *s_or_t, bool #endif s->scfunc(); #ifndef DISABLE_COLOR + /* The command might have re-initialized shortcuts, + * in which case f is now invalid. Let's reload it. */ + f = sctofunc((sc *) s); if (f && !f->viewok && openfile->syntax != NULL && openfile->syntax->nmultis > 0) { reset_multis(openfile->current, FALSE);