updated for version 7.4.022
Problem: Deadlock while exiting, because of allocating memory.
Solution: Do not use gettext() in deathtrap(). (James McCoy)
diff --git a/src/misc1.c b/src/misc1.c
index fd5d1fd..0a2d83b 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -9174,6 +9174,8 @@
/*
* 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 @@
{
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 @@
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 37cc3a7..cc02653 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -957,8 +957,10 @@
/*
* 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 @@
}
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 06bcaa3..5b37f04 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 22,
+/**/
21,
/**/
20,
