Mercurial > vim
changeset 7937:2e905dfc6999 v7.4.1264
commit https://github.com/vim/vim/commit/6076fe1986255d32b7a078a28bf9e7bea19d6f30
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Feb 5 22:49:56 2016 +0100
patch 7.4.1264
Problem: Crash when receiving an empty array.
Solution: Check for array with wrong number of arguments. (Damien)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 05 Feb 2016 23:00:05 +0100 |
| parents | a058fba2b5fd |
| children | f53e542f645f |
| files | src/channel.c src/eval.c src/testdir/test_channel.py src/version.c |
| diffstat | 4 files changed, 18 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/src/channel.c +++ b/src/channel.c @@ -688,7 +688,9 @@ channel_parse_json(int ch_idx) ret = json_decode(&reader, &listtv); if (ret == OK) { - if (listtv.v_type != VAR_LIST) + /* Only accept the response when it is a list with at least two + * items. */ + if (listtv.v_type != VAR_LIST || listtv.vval.v_list->lv_len < 2) { /* TODO: give error */ clear_tv(&listtv); @@ -909,13 +911,6 @@ may_invoke_callback(int idx) } list = listtv->vval.v_list; - if (list->lv_len < 2) - { - /* TODO: give error */ - clear_tv(listtv); - return FALSE; - } - argv[1] = list->lv_first->li_next->li_tv; typetv = &list->lv_first->li_tv; if (typetv->v_type == VAR_STRING)
--- a/src/eval.c +++ b/src/eval.c @@ -9875,18 +9875,12 @@ f_ch_sendexpr(typval_T *argvars, typval_ { if (channel_read_json_block(ch_idx, id, &listtv) == OK) { - if (listtv->v_type == VAR_LIST) - { - list_T *list = listtv->vval.v_list; - - if (list->lv_len == 2) - { - /* Move the item from the list and then change the type to - * avoid the value being freed. */ - *rettv = list->lv_last->li_tv; - list->lv_last->li_tv.v_type = VAR_NUMBER; - } - } + list_T *list = listtv->vval.v_list; + + /* Move the item from the list and then change the type to + * avoid the value being freed. */ + *rettv = list->lv_last->li_tv; + list->lv_last->li_tv.v_type = VAR_NUMBER; clear_tv(listtv); } }
--- a/src/testdir/test_channel.py +++ b/src/testdir/test_channel.py @@ -93,6 +93,11 @@ class ThreadedTCPRequestHandler(socketse print("sending: {}".format(cmd)) self.request.sendall(cmd.encode('utf-8')) response = "ok" + elif decoded[1] == 'empty-request': + cmd = '[]' + 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 @@ -123,11 +128,9 @@ if __name__ == "__main__": server = ThreadedTCPServer((HOST, PORT), ThreadedTCPRequestHandler) ip, port = server.server_address - # Start a thread with the server -- that thread will then start one - # more thread for each request + # Start a thread with the server. That thread will then start a new thread + # for each connection. server_thread = threading.Thread(target=server.serve_forever) - - # Exit the server thread when the main thread terminates server_thread.start() # Write the port number in Xportnr, so that the test knows it.