mirror of
https://github.com/neovim/neovim.git
synced 2026-10-25 23:20:23 -05:00
vim-patch:9.2.0436: Buffer overflow when parsing overlong errorformat lines (#39578)
Problem: When an error line in a file passed to :cfile / :cgetfile is
longer than IOSIZE, qf_parse_file_pfx() copies the tail
into the fixed-size IObuff with STRMOVE(), overflowing the heap buffer.
The same code path can also loop indefinitely because
qf_parse_file_pfx() always returns QF_MULTISCAN when a
tail is present, and qf_init_ext() unconditionally goes
to "restofline" without bounding the tail length (Nabih).
Solution: Remove the STRMOVE() into IObuff. In the QF_MULTISCAN
branch, alias linebuf into the tail directly and update
linelen, requiring strict progress (new length less than
the previous length) before retrying; otherwise ignore
the line.
closes: vim/vim#20126
Supported by AI
https://github.com/vim/vim/commit/77677c33dec485aadd371da75cce55d449b51798
Co-authored-by: Christian Brabandt <cb@256bit.org>
(cherry picked from commit 0e69a38026)
This commit is contained in:
1 parent
4f22640b86
commit
f9f2596288
2 files changed
+30
-2
No files matched your search
+8
-2
@@ -1019,6 +1019,13 @@ restofline:
|
|||||||
// global file names
|
// global file names
|
||||||
status = qf_parse_file_pfx(idx, fields, qfl, tail);
|
status = qf_parse_file_pfx(idx, fields, qfl, tail);
|
||||||
if (status == QF_MULTISCAN) {
|
if (status == QF_MULTISCAN) {
|
||||||
|
char *s = skipwhite(tail);
|
||||||
|
size_t new_linelen = strlen(s);
|
||||||
|
if (new_linelen >= linelen) {
|
||||||
|
return QF_IGNORE_LINE;
|
||||||
|
}
|
||||||
|
linebuf = s;
|
||||||
|
linelen = new_linelen;
|
||||||
goto restofline;
|
goto restofline;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1665,7 +1672,7 @@ static int qf_parse_dir_pfx(int idx, qffields_T *fields, qf_list_T *qfl)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Parse global file name error format prefixes (%O, %P and %Q).
|
/// Parse global file name error format prefixes (%O, %P and %Q).
|
||||||
static int qf_parse_file_pfx(int idx, qffields_T *fields, qf_list_T *qfl, char *tail)
|
static int qf_parse_file_pfx(int idx, qffields_T *fields, qf_list_T *qfl, const char *tail)
|
||||||
{
|
{
|
||||||
fields->valid = false;
|
fields->valid = false;
|
||||||
if (*fields->namebuf == NUL || os_path_exists(fields->namebuf)) {
|
if (*fields->namebuf == NUL || os_path_exists(fields->namebuf)) {
|
||||||
@@ -1676,7 +1683,6 @@ static int qf_parse_file_pfx(int idx, qffields_T *fields, qf_list_T *qfl, char *
|
|||||||
}
|
}
|
||||||
*fields->namebuf = NUL;
|
*fields->namebuf = NUL;
|
||||||
if (tail && *tail) {
|
if (tail && *tail) {
|
||||||
STRMOVE(IObuff, skipwhite(tail));
|
|
||||||
qfl->qf_multiscan = true;
|
qfl->qf_multiscan = true;
|
||||||
return QF_MULTISCAN;
|
return QF_MULTISCAN;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7028,4 +7028,26 @@ func Test_quickfix_longline_noeol()
|
|||||||
call assert_equal(['okay'], readfile("XDONE"))
|
call assert_equal(['okay'], readfile("XDONE"))
|
||||||
endfunc
|
endfunc
|
||||||
|
|
||||||
|
func Test_efm_overlongline()
|
||||||
|
let save_efm = &efm
|
||||||
|
" %r captures the tail.
|
||||||
|
set efm=%+O(%.%#)%r,%f:%l:%m
|
||||||
|
|
||||||
|
" First line is longer than IOSIZE (1025) so the parser puts it in
|
||||||
|
" growbuf; the %r tail then far exceeds IObuff.
|
||||||
|
let lines = ['(short)' .. repeat('x', 4000), 'Xfile:10:msg']
|
||||||
|
call writefile(lines, 'Xqferrlong', 'D')
|
||||||
|
|
||||||
|
" Must complete without hanging or crashing.
|
||||||
|
cgetfile Xqferrlong
|
||||||
|
|
||||||
|
" The well-formed line that follows is still parsed.
|
||||||
|
let well_formed = filter(getqflist(), 'v:val.lnum == 10')
|
||||||
|
call assert_equal(1, len(well_formed))
|
||||||
|
call assert_equal('msg', well_formed[0].text)
|
||||||
|
|
||||||
|
let &efm = save_efm
|
||||||
|
call setqflist([], 'f')
|
||||||
|
endfunc
|
||||||
|
|
||||||
" vim: shiftwidth=2 sts=2 expandtab
|
" vim: shiftwidth=2 sts=2 expandtab
|
||||||
Reference in new issue
Block a user