diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/readline/input.c | 6 | ||||
| -rw-r--r-- | lib/readline/isearch.c | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/readline/input.c b/lib/readline/input.c index e6a39e26..d0a32f69 100644 --- a/lib/readline/input.c +++ b/lib/readline/input.c @@ -971,11 +971,11 @@ postproc_signal: call the application's signal event hook. */ if (rl_signal_event_hook) (*rl_signal_event_hook) (); -#if defined (READLINE_CALLBACKS) - else if (osig == SIGINT && (ostate & RL_STATE_CALLBACK) && (ostate & (RL_STATE_ISEARCH|RL_STATE_NSEARCH|RL_STATE_NUMERICARG))) + /* If the application's SIGINT handler returns, make sure we abort out of + searches and numeric arguments because we've freed necessary state. */ + if (osig == SIGINT && (ostate & (RL_STATE_ISEARCH|RL_STATE_NSEARCH|RL_STATE_NUMERICARG))) /* just these cases for now */ _rl_abort_internal (); -#endif } } diff --git a/lib/readline/isearch.c b/lib/readline/isearch.c index 7b845c20..6cb1879d 100644 --- a/lib/readline/isearch.c +++ b/lib/readline/isearch.c @@ -889,12 +889,14 @@ opcode_dispatch: int _rl_isearch_cleanup (_rl_search_cxt *cxt, int r) { + RL_UNSETSTATE(RL_STATE_ISEARCH); + if (cxt == 0) + return (r != 0); + + _rl_iscxt = 0; if (r >= 0) _rl_isearch_fini (cxt); _rl_scxt_dispose (cxt, 0); - _rl_iscxt = 0; - - RL_UNSETSTATE(RL_STATE_ISEARCH); return (r != 0); } |