Mercurial > vim
changeset 5338:965044860b7f v7.4.022
updated for version 7.4.022
Problem: Deadlock while exiting, because of allocating memory.
Solution: Do not use gettext() in deathtrap(). (James McCoy)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Thu, 05 Sep 2013 21:41:39 +0200 |
| parents | 09ecbbbdee62 |
| children | a00302b18c60 |
| files | src/misc1.c src/os_unix.c src/version.c |
| diffstat | 3 files changed, 19 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/misc1.c +++ b/src/misc1.c @@ -9174,6 +9174,8 @@ prepare_to_exit() /* * Preserve files and exit. * When called IObuff must contain a message. + * NOTE: This may be called from deathtrap() in a signal handler, avoid unsafe + * functions, such as allocating memory. */ void preserve_exit() @@ -9196,7 +9198,7 @@ preserve_exit() { if (buf->b_ml.ml_mfp != NULL && buf->b_ml.ml_mfp->mf_fname != NULL) { - OUT_STR(_("Vim: preserving files...\n")); + OUT_STR("Vim: preserving files...\n"); screen_start(); /* don't know where cursor is now */ out_flush(); ml_sync_all(FALSE, FALSE); /* preserve all swap files */ @@ -9206,7 +9208,7 @@ preserve_exit() ml_close_all(FALSE); /* close all memfiles, without deleting */ - OUT_STR(_("Vim: Finished.\n")); + OUT_STR("Vim: Finished.\n"); getout(1); }
--- a/src/os_unix.c +++ b/src/os_unix.c @@ -957,8 +957,10 @@ mch_didjmp() /* * This function handles deadly signals. - * It tries to preserve any swap file and exit properly. + * It tries to preserve any swap files and exit properly. * (partly from Elvis). + * NOTE: Avoid unsafe functions, such as allocating memory, they can result in + * a deadlock. */ static RETSIGTYPE deathtrap SIGDEFARG(sigarg) @@ -1090,18 +1092,23 @@ deathtrap SIGDEFARG(sigarg) } if (entered == 2) { - OUT_STR(_("Vim: Double signal, exiting\n")); + /* No translation, it may call malloc(). */ + OUT_STR("Vim: Double signal, exiting\n"); out_flush(); getout(1); } + /* No translation, it may call malloc(). */ #ifdef SIGHASARG - sprintf((char *)IObuff, _("Vim: Caught deadly signal %s\n"), + sprintf((char *)IObuff, "Vim: Caught deadly signal %s\n", signal_info[i].name); #else - sprintf((char *)IObuff, _("Vim: Caught deadly signal\n")); -#endif - preserve_exit(); /* preserve files and exit */ + sprintf((char *)IObuff, "Vim: Caught deadly signal\n"); +#endif + + /* Preserve files and exit. This sets the really_exiting flag to prevent + * calling free(). */ + preserve_exit(); #ifdef NBDEBUG reset_signals();