diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-09-05 21:41:39 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-09-05 21:41:39 +0200 |
| commit | bec9c20884290cc64e63d4eec531c0a2fbdcd3f6 (patch) | |
| tree | 6a671564863f197e0d8bf4a471a6a72e149816b3 | |
| parent | 9be44818921a9255b3a26bf5566f1939bf38804e (diff) | |
| download | vim-git-7.4.022.tar.gz | |
updated for version 7.4.022v7.4.022
Problem: Deadlock while exiting, because of allocating memory.
Solution: Do not use gettext() in deathtrap(). (James McCoy)
| -rw-r--r-- | src/misc1.c | 6 | ||||
| -rw-r--r-- | src/os_unix.c | 17 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 18 insertions, 7 deletions
diff --git a/src/misc1.c b/src/misc1.c index fd5d1fda8..0a2d83be0 100644 --- 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); } diff --git a/src/os_unix.c b/src/os_unix.c index 37cc3a7dd..cc026534d 100644 --- 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")); + sprintf((char *)IObuff, "Vim: Caught deadly signal\n"); #endif - preserve_exit(); /* preserve files and exit */ + + /* Preserve files and exit. This sets the really_exiting flag to prevent + * calling free(). */ + preserve_exit(); #ifdef NBDEBUG reset_signals(); diff --git a/src/version.c b/src/version.c index 06bcaa3e4..5b37f047d 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 22, +/**/ 21, /**/ 20, |