Mercurial > vim
changeset 14577:33d751f40e4c v8.1.0302
patch 8.1.0302: crash when using :suspend and "fg"
commit https://github.com/vim/vim/commit/f1883479be91550bc31dd88f593b3012863a2629
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Aug 20 21:58:57 2018 +0200
patch 8.1.0302: crash when using :suspend and "fg"
Problem: Crash when using :suspend and "fg".
Solution: Undo patch 8.1.244.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 20 Aug 2018 22:00:07 +0200 |
| parents | 8aadb6d4e92c |
| children | 4e22895e5442 |
| files | src/os_unix.c src/proto/term.pro src/term.c src/version.c |
| diffstat | 4 files changed, 20 insertions(+), 69 deletions(-) [+] |
line wrap: on
line diff
--- a/src/os_unix.c +++ b/src/os_unix.c @@ -1228,24 +1228,7 @@ deathtrap SIGDEFARG(sigarg) SIGRETURN; } - static void -after_sigcont(void) -{ -# ifdef FEAT_TITLE - // Don't change "oldtitle" in a signal handler, set a flag to obtain it - // again later. - oldtitle_outdated = TRUE; -# endif - settmode(TMODE_RAW); - need_check_timestamps = TRUE; - did_check_timestamps = FALSE; -} - -#if defined(SIGCONT) -static RETSIGTYPE sigcont_handler SIGPROTOARG; -static int in_mch_suspend = FALSE; - -# if defined(_REENTRANT) && defined(SIGCONT) +#if defined(_REENTRANT) && defined(SIGCONT) /* * On Solaris with multi-threading, suspending might not work immediately. * Catch the SIGCONT signal, which will be used as an indication whether the @@ -1257,7 +1240,7 @@ static int in_mch_suspend = FALSE; * volatile because it is used in signal handler sigcont_handler(). */ static volatile int sigcont_received; -# endif +static RETSIGTYPE sigcont_handler SIGPROTOARG; /* * signal handler for SIGCONT @@ -1265,38 +1248,7 @@ static volatile int sigcont_received; static RETSIGTYPE sigcont_handler SIGDEFARG(sigarg) { - if (in_mch_suspend) - { -# if defined(_REENTRANT) && defined(SIGCONT) - sigcont_received = TRUE; -# endif - } - else - { - // We didn't suspend ourselves, assume we were stopped by a SIGSTOP - // signal (which can't be intercepted) and get a SIGCONT. Need to get - // back to a sane mode and redraw. - after_sigcont(); - - update_screen(CLEAR); - if (State & CMDLINE) - redrawcmdline(); - else if (State == HITRETURN || State == SETWSIZE || State == ASKMORE - || State == EXTERNCMD || State == CONFIRM || exmode_active) - repeat_message(); - else if (redrawing()) - setcursor(); -#if defined(FEAT_INS_EXPAND) - if (pum_visible()) - { - redraw_later(NOT_VALID); - ins_compl_show_pum(); - } -#endif - cursor_on_force(); - out_flush(); - } - + sigcont_received = TRUE; SIGRETURN; } #endif @@ -1379,8 +1331,6 @@ mch_suspend(void) { /* BeOS does have SIGTSTP, but it doesn't work. */ #if defined(SIGTSTP) && !defined(__BEOS__) - in_mch_suspend = TRUE; - out_flush(); /* needed to make cursor visible on some systems */ settmode(TMODE_COOK); out_flush(); /* needed to disable mouse on some systems */ @@ -1412,9 +1362,16 @@ mch_suspend(void) mch_delay(wait_time, FALSE); } # endif - in_mch_suspend = FALSE; - - after_sigcont(); + +# ifdef FEAT_TITLE + /* + * Set oldtitle to NULL, so the current title is obtained again. + */ + VIM_CLEAR(oldtitle); +# endif + settmode(TMODE_RAW); + need_check_timestamps = TRUE; + did_check_timestamps = FALSE; #else suspend_shell(); #endif @@ -1454,7 +1411,7 @@ set_signals(void) #ifdef SIGTSTP signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL); #endif -#if defined(SIGCONT) +#if defined(_REENTRANT) && defined(SIGCONT) signal(SIGCONT, sigcont_handler); #endif
--- a/src/proto/term.pro +++ b/src/proto/term.pro @@ -52,7 +52,6 @@ void setmouse(void); int mouse_has(int c); int mouse_model_popup(void); void scroll_start(void); -void cursor_on_force(void); void cursor_on(void); void cursor_off(void); void term_cursor_mode(int forced);
--- a/src/term.c +++ b/src/term.c @@ -3834,23 +3834,16 @@ scroll_start(void) static int cursor_is_off = FALSE; /* - * Enable the cursor without checking if it's already enabled. - */ - void -cursor_on_force(void) -{ - out_str(T_VE); - cursor_is_off = FALSE; -} - -/* * Enable the cursor. */ void cursor_on(void) { if (cursor_is_off) - cursor_on_force(); + { + out_str(T_VE); + cursor_is_off = FALSE; + } } /*