Patch 8.0.0159

46 views
Skip to first unread message

Bram Moolenaar

unread,
Jan 8, 2017, 2:00:38 PM1/8/17
to vim...@googlegroups.com

Patch 8.0.0159
Summary: crash on startup when updating tabline
Problem: Using a NULL pointer when using feedkeys() to trigger drawing a
tabline.
Solution: Skip drawing a tabline if TabPageIdxs is NULL. (Dominique Pelle)
Also fix recursing into getcmdline() from the cmd window.
Files: src/screen.c, src/ex_getln.c


*** ../vim-8.0.0158/src/screen.c 2016-12-09 19:28:33.576993205 +0100
--- src/screen.c 2017-01-08 19:53:03.803518585 +0100
***************
*** 3650,3656 ****
if (fdc > 0)
{
/* Draw the 'foldcolumn'. Allocate a buffer, "extra" may
! * already be in used. */
p_extra_free = alloc(12 + 1);

if (p_extra_free != NULL)
--- 3650,3656 ----
if (fdc > 0)
{
/* Draw the 'foldcolumn'. Allocate a buffer, "extra" may
! * already be in use. */
p_extra_free = alloc(12 + 1);

if (p_extra_free != NULL)
***************
*** 10344,10349 ****
--- 10344,10351 ----
#endif
);

+ if (ScreenLines == NULL)
+ return;
redraw_tabline = FALSE;

#ifdef FEAT_GUI_TABLINE
*** ../vim-8.0.0158/src/ex_getln.c 2016-10-15 15:39:34.685059653 +0200
--- src/ex_getln.c 2017-01-08 19:55:36.542378038 +0100
***************
*** 772,778 ****
--- 772,780 ----
/*
* Open a window to edit the command line (and history).
*/
+ save_cmdline(&save_ccline);
c = ex_window();
+ restore_cmdline(&save_ccline);
some_key_typed = TRUE;
}
}
*** ../vim-8.0.0158/src/version.c 2017-01-08 19:25:34.851896407 +0100
--- src/version.c 2017-01-08 19:38:41.461992894 +0100
***************
*** 766,767 ****
--- 766,769 ----
{ /* Add new patch number below this line */
+ /**/
+ 159,
/**/

--
hundred-and-one symptoms of being an internet addict:
231. You sprinkle Carpet Fresh on the rugs and put your vacuum cleaner
in the front doorway permanently so it always looks like you are
actually attempting to do something about that mess that has amassed
since you discovered the Internet.

/// Bram Moolenaar -- Br...@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 ///

h_east

unread,
Jan 8, 2017, 10:13:47 PM1/8/17
to vim_dev
Hi Bram and list,

2017-1-9(Mon) 4:00:38 UTC+9 Bram Moolenaar:


> Patch 8.0.0159
> Summary: crash on startup when updating tabline
> Problem: Using a NULL pointer when using feedkeys() to trigger drawing a
> tabline.
> Solution: Skip drawing a tabline if TabPageIdxs is NULL. (Dominique Pelle)
> Also fix recursing into getcmdline() from the cmd window.
> Files: src/screen.c, src/ex_getln.c

[...]

A build error has occurred with FEATURES=small
https://travis-ci.org/vim/vim/jobs/190070102

It is fixed by the attached patch.

--
Best regards,
Hirohito Higashi (a.k.a. h_east)

fix_build_error_in_8.0.0159.patch

Bram Moolenaar

unread,
Jan 9, 2017, 6:59:07 AM1/9/17
to vim...@googlegroups.com, h_east
Thanks!

--
The term "free software" is defined by Richard M. Stallman as
being software that isn't necessarily for free. Confusing?
Let's call it "Stallman software" then!
-- Bram Moolenaar
Reply all
Reply to author
Forward
0 new messages