To: vim_dev@googlegroups.com Subject: Patch 8.2.1820 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1820 Problem: Vim9: crash when error happens in timer callback. Solution: Check that current_exception is not NULL. (closes #7100) Files: src/ex_docmd.c *** ../vim-8.2.1819/src/ex_docmd.c 2020-09-28 22:29:25.421766301 +0200 --- src/ex_docmd.c 2020-10-10 15:05:07.486342984 +0200 *************** *** 1234,1239 **** --- 1234,1243 ---- if (trylevel == 0) { + // Just in case did_throw got set but current_exception wasn't. + if (current_exception == NULL) + did_throw = FALSE; + /* * When an exception is being thrown out of the outermost try * conditional, discard the uncaught exception, disable the conversion *** ../vim-8.2.1819/src/version.c 2020-10-10 14:12:58.028646125 +0200 --- src/version.c 2020-10-10 14:57:30.251705145 +0200 *************** *** 752,753 **** --- 752,755 ---- { /* Add new patch number below this line */ + /**/ + 1820, /**/ -- "I simultaneously try to keep my head in the clouds and my feet on the ground. Sometimes it's a stretch, though." -- Larry Wall /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///