patch 7.4.1255
Problem: Crash for channel "eval" command without third argument.
Solution: Check for missing argument.
diff --git a/src/testdir/test_channel.py b/src/testdir/test_channel.py
index f1d774f..dbf9eb2 100644
--- a/src/testdir/test_channel.py
+++ b/src/testdir/test_channel.py
@@ -68,8 +68,8 @@
# simply send back a string
response = "got it"
elif decoded[1] == 'make change':
- # Send two ex commands at the same time, before replying to
- # the request.
+ # Send two ex commands at the same time, before
+ # replying to the request.
cmd = '["ex","call append(\\"$\\",\\"added1\\")"]'
cmd += '["ex","call append(\\"$\\",\\"added2\\")"]'
print("sending: {}".format(cmd))
@@ -87,6 +87,12 @@
print("sending: {}".format(cmd))
self.request.sendall(cmd.encode('utf-8'))
response = "ok"
+ elif decoded[1] == 'eval-bad':
+ # Send an eval request missing the third argument.
+ cmd = '["eval","xxx"]'
+ print("sending: {}".format(cmd))
+ self.request.sendall(cmd.encode('utf-8'))
+ response = "ok"
elif decoded[1] == 'eval-result':
# Send back the last received eval result.
response = last_eval
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index b416520..3caf5d2 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -90,6 +90,10 @@
call assert_equal('ok', ch_sendexpr(handle, 'eval-fails'))
call assert_equal([-2, 'ERROR'], ch_sendexpr(handle, 'eval-result'))
+ " Send a bad eval request. There will be no response.
+ call assert_equal('ok', ch_sendexpr(handle, 'eval-bad'))
+ call assert_equal([-2, 'ERROR'], ch_sendexpr(handle, 'eval-result'))
+
" make the server quit, can't check if this works, should not hang.
call ch_sendexpr(handle, '!quit!', 0)