To: vim_dev@googlegroups.com Subject: Patch 7.4.1751 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1751 Problem: Crash when 'tagstack' is off. (Dominique Pelle) Solution: Fix it. (Hirohito Higashi) Files: src/tag.c, src/testdir/test_alot.vim, src/testdir/test_tagjump.vim *** ../vim-7.4.1750/src/tag.c 2016-04-08 17:07:09.546160667 +0200 --- src/tag.c 2016-04-18 19:42:47.832567910 +0200 *************** *** 200,205 **** --- 200,213 ---- { use_tagstack = FALSE; new_tag = TRUE; + #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX) + if (g_do_tagpreview != 0) + { + vim_free(ptag_entry.tagname); + if ((ptag_entry.tagname = vim_strsave(tag)) == NULL) + goto end_do_tag; + } + #endif } else { *** ../vim-7.4.1750/src/testdir/test_alot.vim 2016-04-16 09:13:31.538407268 +0200 --- src/testdir/test_alot.vim 2016-04-18 19:41:12.433551221 +0200 *************** *** 27,32 **** --- 27,33 ---- source test_statusline.vim source test_syn_attr.vim source test_tabline.vim + source test_tagjump.vim source test_timers.vim source test_undolevels.vim source test_unlet.vim *** ../vim-7.4.1750/src/testdir/test_tagjump.vim 2016-04-18 19:44:12.251697803 +0200 --- src/testdir/test_tagjump.vim 2016-04-18 19:41:12.437551179 +0200 *************** *** 0 **** --- 1,9 ---- + " Tests for tagjump (tags and special searches) + + " SEGV occurs in older versions. (At least 7.4.1748 or older) + func Test_ptag_with_notagstack() + set notagstack + call assert_fails('ptag does_not_exist_tag_name', 'E426') + set tagstack&vim + endfunc + " vim: sw=2 et *** ../vim-7.4.1750/src/version.c 2016-04-18 19:27:18.026188419 +0200 --- src/version.c 2016-04-18 19:43:38.084049965 +0200 *************** *** 750,751 **** --- 750,753 ---- { /* Add new patch number below this line */ + /**/ + 1751, /**/ -- Luxury. We used to have to get out of the lake at three o'clock in the morning, clean the lake, eat a handful of hot gravel, go to work at the mill every day for tuppence a month, come home, and Dad would beat us around the head and neck with a broken bottle, if we were LUCKY! /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///