Mercurial > vim
diff src/vim9compile.c @ 21883:a427f5f26419 v8.2.1491
patch 8.2.1491: Vim9: crash when compiling heredoc lines start with comment
Commit: https://github.com/vim/vim/commit/66250c932e8a0e3c43e7c7c7b1dbede040b9c508
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Aug 20 15:02:42 2020 +0200
patch 8.2.1491: Vim9: crash when compiling heredoc lines start with comment
Problem: Vim9: crash when compiling heredoc lines start with comment.
Solution: Skip over NULL pointers. Do not remove comment and empty lines
when fetching function lines. (closes #6743)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 20 Aug 2020 15:15:05 +0200 |
| parents | 675bf9475fff |
| children | f19ac9b8b011 |
line wrap: on
line diff
--- a/src/vim9compile.c +++ b/src/vim9compile.c @@ -4197,18 +4197,21 @@ exarg_getline( int c UNUSED, void *cookie, int indent UNUSED, - int do_concat UNUSED) + getline_opt_T options UNUSED) { cctx_T *cctx = (cctx_T *)cookie; - - if (cctx->ctx_lnum == cctx->ctx_ufunc->uf_lines.ga_len) - { - iemsg("Heredoc got to end"); - return NULL; - } - ++cctx->ctx_lnum; - return vim_strsave(((char_u **)cctx->ctx_ufunc->uf_lines.ga_data) - [cctx->ctx_lnum]); + char_u *p; + + for (;;) + { + if (cctx->ctx_lnum == cctx->ctx_ufunc->uf_lines.ga_len) + return NULL; + ++cctx->ctx_lnum; + p = ((char_u **)cctx->ctx_ufunc->uf_lines.ga_data)[cctx->ctx_lnum]; + // Comment lines result in NULL pointers, skip them. + if (p != NULL) + return vim_strsave(p); + } } /*