diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-09-05 23:01:12 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-09-05 23:01:12 +0200 |
| commit | 6756c7037f07e1fb54e1b9d8e92567ac388617c4 (patch) | |
| tree | 999028b085198f76b7ea283209cc3301b6e1928a | |
| parent | 3971905bac0fe7e7519b35b1e558b4f1de55708d (diff) | |
patch 8.0.1061: Coverity: no check for NULL commandv8.0.1061
Problem: Coverity: no check for NULL command.
Solution: Check for NULL list item.
| -rw-r--r-- | src/terminal.c | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/terminal.c b/src/terminal.c index 9660c64ba7..b3f5f0af1c 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -38,7 +38,9 @@ * in tl_scrollback are no longer used. * * TODO: - * - ":term NONE" does not work in MS-Windows. + * - ":term NONE" does not work on MS-Windows. + * https://github.com/vim/vim/pull/2056 + * - Redirecting output does not work on MS-Windows. * - implement term_setsize() * - add test for giving error for invalid 'termsize' value. * - support minimal size when 'termsize' is "rows*cols". @@ -56,6 +58,8 @@ * - In the GUI use a terminal emulator for :!cmd. * - Copy text in the vterm to the Vim buffer once in a while, so that * completion works. + * - add an optional limit for the scrollback size. When reaching it remove + * 10% at the start. */ #include "vim.h" @@ -366,10 +370,10 @@ term_start(typval_T *argvar, jobopt_T *opt, int forceit) } else if (argvar->v_type != VAR_LIST || argvar->vval.v_list == NULL - || argvar->vval.v_list->lv_len < 1) + || argvar->vval.v_list->lv_len < 1 + || (cmd = get_tv_string_chk( + &argvar->vval.v_list->lv_first->li_tv)) == NULL) cmd = (char_u*)""; - else - cmd = get_tv_string_chk(&argvar->vval.v_list->lv_first->li_tv); len = STRLEN(cmd) + 10; p = alloc((int)len); diff --git a/src/version.c b/src/version.c index 86a170b730..741536e2ff 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1061, +/**/ 1060, /**/ 1059, |