aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.2.2802: Vim9: illegal memory access

Browse Source 
Problem:    Vim9: illegal memory access.
Solution:   Check for comment before checking for white space. (closes #8142)
This commit is contained in:
Bram Moolenaar
2021-04-23 19:32:23 +02:00
parent f6d9935a13
commit a6aa16423f
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/eval.c
View File

@@ -2083,7 +2083,8 @@ getline_peek_skip_comments(evalarg_T *evalarg)
* If inside Vim9 script, "arg" points to the end of a line (ignoring a #
* comment) and there is a next line, return the next line (skipping blanks)
* and set "getnext".
* Otherwise just return "arg" unmodified and set "getnext" to FALSE.
* Otherwise return the next non-white at or after "arg" and set "getnext" to
* FALSE.
* "arg" must point somewhere inside a line, not at the start.
*/
char_u *
@@ -2095,7 +2096,7 @@ eval_next_non_blank(char_u *arg, evalarg_T *evalarg, int *getnext)
if (in_vim9script()
&& evalarg != NULL
&& (evalarg->eval_cookie != NULL || evalarg->eval_cctx != NULL)
&& (*p == NUL || (VIM_ISWHITE(p[-1]) && vim9_comment_start(p))))
&& (*p == NUL || (vim9_comment_start(p) && VIM_ISWHITE(p[-1]))))
{
char_u *next;