diff options
| author | watiko <service@mail.watiko.net> | 2016-02-15 14:17:35 +0900 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-02-22 00:51:13 -0500 |
| commit | 2eb09c826d7afba38331b4001db709df9c633894 (patch) | |
| tree | df2cd5e62ef5c5f4f41c6d7c181f4f81c2095aa7 | |
| parent | 2f98888db611891e4a814bd833dcbba42608b8cc (diff) | |
| download | rneovim-2eb09c826d7afba38331b4001db709df9c633894.tar.gz rneovim-2eb09c826d7afba38331b4001db709df9c633894.tar.bz2 rneovim-2eb09c826d7afba38331b4001db709df9c633894.zip | |
vim-patch:7.4.878 #4258
Problem: Coverity error for clearing only one byte of struct.
Solution: Clear the whole struct. (Dominique Pelle)
https://github.com/vim/vim/commit/69b67f7e774dc212e8c97495ee81c601b8a89ac2
| -rw-r--r-- | src/nvim/ex_docmd.c | 15 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index b1d37cfb31..2d17b31f0f 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -381,15 +381,14 @@ int do_cmdline(char_u *cmdline, LineGetter fgetline, suppress_errthrow = FALSE; } - /* - * If requested, store and reset the global values controlling the - * exception handling (used when debugging). Otherwise clear it to avoid - * a bogus compiler warning when the optimizer uses inline functions... - */ - if (flags & DOCMD_EXCRESET) + // If requested, store and reset the global values controlling the + // exception handling (used when debugging). Otherwise clear it to avoid + // a bogus compiler warning when the optimizer uses inline functions... + if (flags & DOCMD_EXCRESET) { save_dbg_stuff(&debug_saved); - else - memset(&debug_saved, 0, 1); + } else { + memset(&debug_saved, 0, sizeof(debug_saved)); + } initial_trylevel = trylevel; diff --git a/src/nvim/version.c b/src/nvim/version.c index d0ccd7e6a5..3d299bbc8d 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -412,7 +412,7 @@ static int included_patches[] = { 881, // 880 NA 879, - // 878, + 878, 877, // 876 NA // 875 NA |