aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

patch 8.1.2340: quickfix test fails under valgrind and asan

Browse Source 
Problem:    Quickfix test fails under valgrind and asan.
Solution:   Make sure long line does not overflow IObuff. (Dominique Pelle,
            closes #5263)  Put back fix for large terminals. (Yegappan
            Lakshmanan, closes #5264)
This commit is contained in:
Bram Moolenaar
2019-11-24 22:13:58 +01:00
parent 70077dd1ca
commit a106e6cde6
3 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/quickfix.c
View File

@@ -4416,7 +4416,7 @@ qf_buf_add_line(buf_T *buf, linenr_T lnum, qfline_T *qfp, char_u *dirname)
if (qfp->qf_module != NULL) if (qfp->qf_module != NULL)
{ {
STRCPY(IObuff, qfp->qf_module); vim_strncpy(IObuff, qfp->qf_module, IOSIZE - 1);
len = (int)STRLEN(IObuff); len = (int)STRLEN(IObuff);
} }
else if (qfp->qf_fnum != 0 else if (qfp->qf_fnum != 0
@@ -4424,7 +4424,7 @@ qf_buf_add_line(buf_T *buf, linenr_T lnum, qfline_T *qfp, char_u *dirname)
&& errbuf->b_fname != NULL) && errbuf->b_fname != NULL)
{ {
if (qfp->qf_type == 1) // :helpgrep if (qfp->qf_type == 1) // :helpgrep
STRCPY(IObuff, gettail(errbuf->b_fname)); vim_strncpy(IObuff, gettail(errbuf->b_fname), IOSIZE - 1);
else else
{ {
// shorten the file name if not done already // shorten the file name if not done already
@@ -4435,26 +4435,29 @@ qf_buf_add_line(buf_T *buf, linenr_T lnum, qfline_T *qfp, char_u *dirname)
mch_dirname(dirname, MAXPATHL); mch_dirname(dirname, MAXPATHL);
shorten_buf_fname(errbuf, dirname, FALSE); shorten_buf_fname(errbuf, dirname, FALSE);
} }
STRCPY(IObuff, errbuf->b_fname); vim_strncpy(IObuff, errbuf->b_fname, IOSIZE - 1);
} }
len = (int)STRLEN(IObuff); len = (int)STRLEN(IObuff);
} }
else else
len = 0; len = 0;
IObuff[len++] = '|';
if (len < IOSIZE - 1)
IObuff[len++] = '|';
if (qfp->qf_lnum > 0) if (qfp->qf_lnum > 0)
{ {
sprintf((char *)IObuff + len, "%ld", qfp->qf_lnum); vim_snprintf((char *)IObuff + len, IOSIZE - len, "%ld", qfp->qf_lnum);
len += (int)STRLEN(IObuff + len); len += (int)STRLEN(IObuff + len);
if (qfp->qf_col > 0) if (qfp->qf_col > 0)
{ {
sprintf((char *)IObuff + len, " col %d", qfp->qf_col); vim_snprintf((char *)IObuff + len, IOSIZE - len,
" col %d", qfp->qf_col);
len += (int)STRLEN(IObuff + len); len += (int)STRLEN(IObuff + len);
} }
sprintf((char *)IObuff + len, "%s", vim_snprintf((char *)IObuff + len, IOSIZE - len, "%s",
(char *)qf_types(qfp->qf_type, qfp->qf_nr)); (char *)qf_types(qfp->qf_type, qfp->qf_nr));
len += (int)STRLEN(IObuff + len); len += (int)STRLEN(IObuff + len);
} }
@@ -4463,8 +4466,11 @@ qf_buf_add_line(buf_T *buf, linenr_T lnum, qfline_T *qfp, char_u *dirname)
qf_fmt_text(qfp->qf_pattern, IObuff + len, IOSIZE - len); qf_fmt_text(qfp->qf_pattern, IObuff + len, IOSIZE - len);
len += (int)STRLEN(IObuff + len); len += (int)STRLEN(IObuff + len);
} }
IObuff[len++] = '|'; if (len < IOSIZE - 2)
IObuff[len++] = ' '; {
IObuff[len++] = '|';
IObuff[len++] = ' ';
}
// Remove newlines and leading whitespace from the text. // Remove newlines and leading whitespace from the text.
// For an unrecognized line keep the indent, the compiler may // For an unrecognized line keep the indent, the compiler may

13
src/testdir/test_quickfix.vim
View File

@@ -626,10 +626,15 @@ func s:test_xhelpgrep(cchar)
let w3 = win_getid() let w3 = win_getid()
call assert_true(&buftype == 'help') call assert_true(&buftype == 'help')
call assert_true(winnr() == 1) call assert_true(winnr() == 1)
call win_gotoid(w1) " See jump_to_help_window() for details
call assert_equal(w3, win_getid(winnr('k'))) let w2_width = winwidth(w2)
call win_gotoid(w2) if w2_width != &columns && w2_width < 80
call assert_equal(w3, win_getid(winnr('k'))) call assert_equal(['col', [['leaf', w3],
\ ['row', [['leaf', w2], ['leaf', w1]]]]], winlayout())
else
call assert_equal(['row', [['col', [['leaf', w3], ['leaf', w2]]],
\ ['leaf', w1]]] , winlayout())
endif
new | only new | only
set buftype=help set buftype=help

2
src/version.c
View File

@@ -737,6 +737,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2340,
/**/ /**/
2339, 2339,
/**/ /**/