Mercurial > vim
comparison src/channel.c @ 8070:e4c3f6720b03 v7.4.1329
commit https://github.com/vim/vim/commit/5cefd4098204b4677387511b586673649f2fab48
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Feb 16 12:44:26 2016 +0100
patch 7.4.1329
Problem: Crash when using channel that failed to open.
Solution: Check for NULL. Update messages. (Yukihiro Nakadaira)
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 16 Feb 2016 12:45:05 +0100 |
parents | 7fe3b9dc132b |
children | 38887bf423ba |
comparison
equal
deleted
inserted
replaced
8069:0df672ac12da | 8070:e4c3f6720b03 |
---|---|
632 } | 632 } |
633 if (!success) | 633 if (!success) |
634 { | 634 { |
635 /* Get here when the server can't be found. */ | 635 /* Get here when the server can't be found. */ |
636 ch_error(NULL, "Cannot connect to port after retry\n"); | 636 ch_error(NULL, "Cannot connect to port after retry\n"); |
637 PERROR(_("E899: Cannot connect to port after retry2")); | 637 PERROR(_("E899: Cannot connect to port after retry")); |
638 sock_close(sd); | 638 sock_close(sd); |
639 channel_free(channel); | 639 channel_free(channel); |
640 return NULL; | 640 return NULL; |
641 } | 641 } |
642 } | 642 } |
1218 * This does not trigger the close callback. | 1218 * This does not trigger the close callback. |
1219 */ | 1219 */ |
1220 void | 1220 void |
1221 channel_close(channel_T *channel) | 1221 channel_close(channel_T *channel) |
1222 { | 1222 { |
1223 ch_log(channel, "Closing channel"); | 1223 ch_log(channel, "Closing channel\n"); |
1224 | 1224 |
1225 #ifdef FEAT_GUI | 1225 #ifdef FEAT_GUI |
1226 channel_gui_unregister(channel); | 1226 channel_gui_unregister(channel); |
1227 #endif | 1227 #endif |
1228 | 1228 |