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.1.1094: long line in tags file causes error

Browse Source 
Problem:    Long line in tags file causes error.
Solution:   Check for overlong line earlier. (Andy Massimino, closes #4051,
            closes #4084)
This commit is contained in:
Bram Moolenaar
2019-03-30 21:41:48 +01:00
parent 96428dd4e9
commit 5209334c55
3 changed files with 59 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/tag.c
View File

@@ -1921,6 +1921,32 @@ line_read_in:
}
parse_line:
if (vim_strchr(lbuf, NL) == NULL
#ifdef FEAT_CSCOPE
&& !use_cscope
#endif
)
{
// Truncated line, ignore it. Has been reported for
// Mozilla JS with extremely long names.
if (p_verbose >= 5)
{
verbose_enter();
msg(_("Ignoring long line in tags file"));
verbose_leave();
}
#ifdef FEAT_TAG_BINS
if (state != TS_LINEAR)
{
// Avoid getting stuck.
linear = TRUE;
state = TS_LINEAR;
vim_fseek(fp, search_info.low_offset, SEEK_SET);
}
#endif
continue;
}
/*
* Figure out where the different strings are in this line.
* For "normal" tags: Do a quick check if the tag matches.
@@ -1937,28 +1963,6 @@ parse_line:
tagp.tagname_end = vim_strchr(lbuf, TAB);
if (tagp.tagname_end == NULL)
{
if (vim_strchr(lbuf, NL) == NULL)
{
/* Truncated line, ignore it. Has been reported for
* Mozilla JS with extremely long names. */
if (p_verbose >= 5)
{
verbose_enter();
msg(_("Ignoring long line in tags file"));
verbose_leave();
}
#ifdef FEAT_TAG_BINS
if (state != TS_LINEAR)
{
/* Avoid getting stuck. */
linear = TRUE;
state = TS_LINEAR;
vim_fseek(fp, search_info.low_offset, SEEK_SET);
}
#endif
continue;
}
/* Corrupted tag line. */
line_error = TRUE;
break;

31
src/testdir/test_tagjump.vim
View File

@@ -439,4 +439,35 @@ func Test_tagnr_recall()
call delete('Xtest.c')
endfunc
func Test_tag_line_toolong()
call writefile([
\ '1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678 django/contrib/admin/templates/admin/edit_inline/stacked.html 16;" j line:16 language:HTML'
\ ], 'Xtags')
set tags=Xtags
let old_vbs = &verbose
set verbose=5
" ":tjump" should give "tag not found" not "Format error in tags file"
call assert_fails('tj /foo', 'E426')
try
tj /foo
catch /^Vim\%((\a\+)\)\=:E431/
call assert_report(v:exception)
catch /.*/
endtry
call assert_equal('Ignoring long line in tags file', split(execute('messages'), '\n')[-1])
call writefile([
\ '123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567 django/contrib/admin/templates/admin/edit_inline/stacked.html 16;" j line:16 language:HTML'
\ ], 'Xtags')
call assert_fails('tj /foo', 'E426')
try
tj /foo
catch /^Vim\%((\a\+)\)\=:E431/
call assert_report(v:exception)
catch /.*/
endtry
call assert_equal('Ignoring long line in tags file', split(execute('messages'), '\n')[-1])
call delete('Xtags')
let &verbose = old_vbs
endfunc
" vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

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