To: vim_dev@googlegroups.com Subject: Patch 7.4.1849 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.4.1849 Problem: Still trying to read from channel that is going to be closed. (Ramel Eshed) Solution: Check if ch_to_be_closed is set. Files: src/channel.c *** ../vim-7.4.1848/src/channel.c 2016-05-25 21:48:07.397807422 +0200 --- src/channel.c 2016-05-27 19:53:16.391525211 +0200 *************** *** 2893,2898 **** --- 2893,2902 ---- sock_T fd; int use_socket = FALSE; + /* If we detected a read error don't try reading again. */ + if (channel->ch_to_be_closed) + return; + fd = channel->ch_part[part].ch_fd; if (fd == INVALID_FD) { *************** *** 3193,3198 **** --- 3197,3206 ---- for (channel = first_channel; channel != NULL; channel = channel->ch_next) { + /* If we detected a read error don't try reading again. */ + if (channel->ch_to_be_closed) + continue; + /* check the socket and pipes */ for (part = PART_SOCK; part <= PART_ERR; ++part) { *** ../vim-7.4.1848/src/version.c 2016-05-26 22:09:56.088600919 +0200 --- src/version.c 2016-05-27 19:54:47.207523962 +0200 *************** *** 755,756 **** --- 755,758 ---- { /* Add new patch number below this line */ + /**/ + 1849, /**/ -- hundred-and-one symptoms of being an internet addict: 20. When looking at a pageful of someone else's links, you notice all of them are already highlighted in purple. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///