summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-11-26 21:19:11 +0100
committerBram Moolenaar <Bram@vim.org>2018-11-26 21:19:11 +0100
commit1341024e0823d9aa9cde08d6b55e12f2d90ff778 (patch)
tree5b402bfbe9a6a0062429adf3c6ac02c1224b24f9
parent3067a4dd0d768d1e4a47cf3c100f3e2b462717d7 (diff)
patch 8.1.0548: crash when job callback unloads a bufferv8.1.0548
Problem: Crash when job callback unloads a buffer. (James McCoy) Solution: Don't round up the wait time to 10 msec in ui_inchar().
-rw-r--r--src/ui.c3
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ui.c b/src/ui.c
index 5ae0ae38b7..d341448e3b 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -154,8 +154,7 @@ ui_inchar(
static int count = 0;
# ifndef NO_CONSOLE
- retval = mch_inchar(buf, maxlen, (wtime >= 0 && wtime < 10)
- ? 10L : wtime, tb_change_cnt);
+ retval = mch_inchar(buf, maxlen, wtime, tb_change_cnt);
if (retval > 0 || typebuf_changed(tb_change_cnt) || wtime >= 0)
goto theend;
# endif
diff --git a/src/version.c b/src/version.c
index 3207af3b4e..3d4fa68df0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 548,
+/**/
547,
/**/
546,