Permalink
Browse files

patch 7.4.2225

Problem:    Crash when placing a sign in a deleted buffer.
Solution:   Check for missing buffer name. (Dominique Pelle). Add a test.
  • Loading branch information...
1 parent af9c4c9 commit bfd096d02087a10e8e2f4bdfb74e0435506fa8bb @brammool brammool committed Aug 17, 2016
Showing with 19 additions and 0 deletions.
  1. +5 −0 src/ex_cmds.c
  2. +12 −0 src/testdir/test_signs.vim
  3. +2 −0 src/version.c
View
@@ -7861,6 +7861,11 @@ ex_sign(exarg_T *eap)
{ /* ... not currently in a window */
char_u *cmd;
+ if (buf->b_fname == NULL)
+ {
+ EMSG(_("E934: Cannot jump to a buffer that does not have a name"));
+ return;
+ }
cmd = alloc((unsigned)STRLEN(buf->b_fname) + 25);
if (cmd == NULL)
return;
@@ -181,3 +181,15 @@ func Test_sign_invalid_commands()
call assert_fails('sign place 1 buffer=', 'E158:')
call assert_fails('sign define Sign2 text=', 'E239:')
endfunc
+
+func Test_sign_delete_buffer()
+ new
+ sign define Sign text=x
+ let bufnr = bufnr('%')
+ new
+ exe 'bd ' . bufnr
+ exe 'sign place 61 line=3 name=Sign buffer=' . bufnr
+ call assert_fails('sign jump 61 buffer=' . bufnr, 'E934:')
+ sign unplace 61
+ sign undefine Sign
+endfunc
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2225,
+/**/
2224,
/**/
2223,

0 comments on commit bfd096d

Please sign in to comment.