Skip to content

Commit

Permalink
Fix segfault when bindsym command is empty (#5001)
Browse files Browse the repository at this point in the history
Remove end token from BINDCOMMAND

fixes i3/i3#5000: bindsym command cannot be empty, because NULL string
causes i3 to segfault when copied in configure_binding()
  • Loading branch information
zhrvn authored Jun 8, 2022
1 parent 6ab64aa commit ce2665c
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 2 deletions.
2 changes: 0 additions & 2 deletions parser-specs/config.spec
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,6 @@ state BINDCOMMAND:
->
command = string
-> call cfg_binding($bindtype, $modifiers, $key, $release, $border, $whole_window, $exclude_titlebar, $command)
end
-> call cfg_binding($bindtype, $modifiers, $key, $release, $border, $whole_window, $exclude_titlebar, $command)

################################################################################
# Mode configuration
Expand Down
1 change: 1 addition & 0 deletions release-notes/bugfixes/7-fix-segfault
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix segfault if command in bindsym is empty
31 changes: 31 additions & 0 deletions testcases/t/546-empty-bindcommand.t
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!perl
# vim:ts=4:sw=4:expandtab
#
# Please read the following documents before working on tests:
# • https://build.i3wm.org/docs/testsuite.html
# (or docs/testsuite)
#
# • https://build.i3wm.org/docs/lib-i3test.html
# (alternatively: perldoc ./testcases/lib/i3test.pm)
#
# • https://build.i3wm.org/docs/ipc.html
# (or docs/ipc)
#
# • http://onyxneon.com/books/modern_perl/modern_perl_a4.pdf
# (unless you are already familiar with Perl)
#
# Test that i3 doesn't crash if the binding command is empty.
# Ticket: #5000

use i3test i3_autostart => 0;

my $config = <<EOT;
# i3 config file (v4)
bindsym X
EOT

my $pid = launch_with_config($config);
does_i3_live;

exit_gracefully($pid);
done_testing;

0 comments on commit ce2665c

Please sign in to comment.