diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-02-29 22:55:56 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-02-29 22:55:56 +0100 |
| commit | cc7f8be3e0e6c4d902b02052a862e21c3a3fbe22 (patch) | |
| tree | 7f4fec6ea3a6e744375837d15b59fa9f595ef215 /src/channel.c | |
| parent | 5131c144feb046c5e2b72e6c172159d80ce06b3c (diff) | |
| download | vim-cc7f8be3e0e6c4d902b02052a862e21c3a3fbe22.zip | |
patch 7.4.1465
Problem: Coverity reported possible use of NULL pointer when using buffer
output with JSON mode.
Solution: Make it actually possible to use JSON mode with a buffer.
Re-encode the JSON to append it to the buffer.
Diffstat (limited to 'src/channel.c')
| -rw-r--r-- | src/channel.c | 51 |
1 files changed, 29 insertions, 22 deletions
diff --git a/src/channel.c b/src/channel.c index a1ea6b843..b6a968b66 100644 --- a/src/channel.c +++ b/src/channel.c @@ -926,8 +926,9 @@ channel_set_options(channel_T *channel, jobopt_T *opt) if ((opt->jo_set & JO_OUT_IO) && opt->jo_io[PART_OUT] == JIO_BUFFER) { - /* writing output to a buffer. Force mode to NL. */ - channel->ch_part[PART_OUT].ch_mode = MODE_NL; + /* writing output to a buffer. Default mode is NL. */ + if (!(opt->jo_set & JO_OUT_MODE)) + channel->ch_part[PART_OUT].ch_mode = MODE_NL; channel->ch_part[PART_OUT].ch_buffer = find_buffer(opt->jo_io_name[PART_OUT]); ch_logs(channel, "writing to buffer '%s'", @@ -1560,32 +1561,38 @@ may_invoke_callback(channel_T *channel, int part) u_sync(TRUE); u_save(lnum, lnum + 1); - ml_append(lnum, msg, 0, FALSE); - appended_lines_mark(lnum, 1L); - curbuf = save_curbuf; - - if (buffer->b_nwindows > 0) + if (msg == NULL) + /* JSON or JS mode: re-encode the message. */ + msg = json_encode(listtv, ch_mode); + if (msg != NULL) { - win_T *wp; - win_T *save_curwin; + ml_append(lnum, msg, 0, FALSE); + appended_lines_mark(lnum, 1L); + curbuf = save_curbuf; - FOR_ALL_WINDOWS(wp) + if (buffer->b_nwindows > 0) { - if (wp->w_buffer == buffer - && wp->w_cursor.lnum == lnum - && wp->w_cursor.col == 0) + win_T *wp; + win_T *save_curwin; + + FOR_ALL_WINDOWS(wp) { - ++wp->w_cursor.lnum; - save_curwin = curwin; - curwin = wp; - curbuf = curwin->w_buffer; - scroll_cursor_bot(0, FALSE); - curwin = save_curwin; - curbuf = curwin->w_buffer; + if (wp->w_buffer == buffer + && wp->w_cursor.lnum == lnum + && wp->w_cursor.col == 0) + { + ++wp->w_cursor.lnum; + save_curwin = curwin; + curwin = wp; + curbuf = curwin->w_buffer; + scroll_cursor_bot(0, FALSE); + curwin = save_curwin; + curbuf = curwin->w_buffer; + } } + redraw_buf_later(buffer, VALID); + channel_need_redraw = TRUE; } - redraw_buf_later(buffer, VALID); - channel_need_redraw = TRUE; } } if (callback != NULL) |