From ce2665ca9604fe4f2095a0f5d71e1230b133ae07 Mon Sep 17 00:00:00 2001
From: zhiv-git <107057313+zhiv-git@users.noreply.github.com>
Date: Wed, 8 Jun 2022 23:38:21 +0300
Subject: [PATCH] Fix segfault when bindsym command is empty (#5001)

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()
---
 parser-specs/config.spec              |  2 --
 release-notes/bugfixes/7-fix-segfault |  1 +
 testcases/t/546-empty-bindcommand.t   | 31 +++++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 release-notes/bugfixes/7-fix-segfault
 create mode 100644 testcases/t/546-empty-bindcommand.t

diff --git a/parser-specs/config.spec b/parser-specs/config.spec
index b62491ed3..30d3d6870 100644
--- a/parser-specs/config.spec
+++ b/parser-specs/config.spec
@@ -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
diff --git a/release-notes/bugfixes/7-fix-segfault b/release-notes/bugfixes/7-fix-segfault
new file mode 100644
index 000000000..5c280beef
--- /dev/null
+++ b/release-notes/bugfixes/7-fix-segfault
@@ -0,0 +1 @@
+Fix segfault if command in bindsym is empty
diff --git a/testcases/t/546-empty-bindcommand.t b/testcases/t/546-empty-bindcommand.t
new file mode 100644
index 000000000..dae262935
--- /dev/null
+++ b/testcases/t/546-empty-bindcommand.t
@@ -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;