Mercurial > vim
diff src/getchar.c @ 17184:a5c3d374e1d3 v8.1.1591
patch 8.1.1591: on error garbage collection may free memory in use
commit https://github.com/vim/vim/commit/7d491c425334d9477637372a4ebec64c228c8430
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jun 25 06:28:02 2019 +0200
patch 8.1.1591: on error garbage collection may free memory in use
Problem: On error garbage collection may free memory in use.
Solution: Reset may_garbage_collect when evaluating expression mapping.
Add tests. (Ozaki Kiichi, closes #4579)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 25 Jun 2019 06:30:09 +0200 |
| parents | 998603a243d7 |
| children | 6f1679e1082d |
line wrap: on
line diff
--- a/src/getchar.c +++ b/src/getchar.c @@ -2540,13 +2540,18 @@ vgetorpeek(int advance) */ if (mp->m_expr) { - int save_vgetc_busy = vgetc_busy; + int save_vgetc_busy = vgetc_busy; + int save_may_garbage_collect = may_garbage_collect; vgetc_busy = 0; + may_garbage_collect = FALSE; + save_m_keys = vim_strsave(mp->m_keys); save_m_str = vim_strsave(mp->m_str); s = eval_map_expr(save_m_str, NUL); + vgetc_busy = save_vgetc_busy; + may_garbage_collect = save_may_garbage_collect; } else #endif