Fix: interrupting confirm() called in timer causes vim hang #1791
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* calling confirm() in timer in vgetc() (not in do_sleep()) * calling feedkeys() in timer * and interrupt confirm() by Ctrl-C
Codecov Report
@@ Coverage Diff @@
## master #1791 +/- ##
==========================================
- Coverage 75.08% 75.07% -0.02%
==========================================
Files 76 76
Lines 125067 125072 +5
==========================================
- Hits 93907 93897 -10
- Misses 31160 31175 +15
Continue to review full report at Codecov.
|
dpelle
pushed a commit
to dpelle/vim
that referenced
this pull request
Jul 31, 2017
Problem: When a function invoked from a timer calls confirm() and the user
types CTRL-C then Vim hangs.
Solution: Reset typebuf_was_filled. (Ozaki Kiichi, closes vim#1791)
janlazo
added a commit
to janlazo/neovim
that referenced
this pull request
Jul 9, 2018
Problem: When a function invoked from a timer calls confirm() and the user
types CTRL-C then Vim hangs.
Solution: Reset typebuf_was_filled. (Ozaki Kiichi, closes vim/vim#1791)
vim/vim@4eb6531
janlazo
added a commit
to janlazo/neovim
that referenced
this pull request
Jul 9, 2018
Problem: When a function invoked from a timer calls confirm() and the user
types CTRL-C then Vim hangs.
Solution: Reset typebuf_was_filled. (Ozaki Kiichi, closes vim/vim#1791)
vim/vim@4eb6531
janlazo
added a commit
to janlazo/neovim
that referenced
this pull request
Jul 20, 2018
Problem: When a function invoked from a timer calls confirm() and the user
types CTRL-C then Vim hangs.
Solution: Reset typebuf_was_filled. (Ozaki Kiichi, closes vim/vim#1791)
vim/vim@4eb6531
janlazo
added a commit
to janlazo/neovim
that referenced
this pull request
Aug 5, 2018
Problem: When a function invoked from a timer calls confirm() and the user
types CTRL-C then Vim hangs.
Solution: Reset typebuf_was_filled. (Ozaki Kiichi, closes vim/vim#1791)
vim/vim@4eb6531
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
repro steps
test-environments:
test.vim
vim -Nu NONE -S test.vimand input Ctrl-C to interrupt
confirm(), then vim will hang.Note:
input()also instead ofconfirm().cause
preconditions:
confirm()andfeedkeys()are called from timer fired in waiting for input (not indo_sleep())confirm()isn't enclosed bytry(i.e. exception isn't caught inside timer callback)feedkeys()in timer setstypebuf_was_filledto TRUE, sotypebuf_changed()returns TRUE,but Ctrl-C flushes all input buffer and
typebuf_was_filledis kept to TRUE, thus cannot exit from this loop: https://github.com/vim/vim/tree/06f1ed2f78c5c03af95054fc3a8665df39dec362/src/getchar.c#L2029proposal of fix
typebuf_was_filledto FALSE inflush_buffers()(but but I'm not sure there is no side influence by this change...)
Ozaki Kiichi