changeset 7007:5ea5bd9c18d2 v7.4.821

patch 7.4.821 Problem: Coverity reports a few problems. Solution: Avoid the warnings. (Christian Brabandt)
author Bram Moolenaar <bram@vim.org>
date Tue, 11 Aug 2015 18:53:03 +0200
parents 1520ad7bad2f
children 7ce1f4e998bb
files src/ex_docmd.c src/option.c src/screen.c src/version.c
diffstat 4 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -4520,6 +4520,9 @@ get_address(ptr, addr_type, skip, to_oth
 			pos.col = MAXCOL;
 		    else
 			pos.col = 0;
+#ifdef FEAT_VIRTUALEDIT
+		    pos.coladd = 0;
+#endif
 		    if (searchit(curwin, curbuf, &pos,
 				*cmd == '?' ? BACKWARD : FORWARD,
 				(char_u *)"", 1L, SEARCH_MSG,
--- a/src/option.c
+++ b/src/option.c
@@ -9990,6 +9990,8 @@ unset_global_local_option(name, from)
     buf_T	*buf = (buf_T *)from;
 
     opt_idx = findoption(name);
+    if (opt_idx < 0)
+	return;
     p = &(options[opt_idx]);
 
     switch ((int)p->indir)
--- a/src/screen.c
+++ b/src/screen.c
@@ -7801,7 +7801,7 @@ next_search_hl_pos(shl, lnum, posmatch, 
 	}
     }
     posmatch->cur = 0;
-    if (shl->lnum == lnum)
+    if (shl->lnum == lnum && bot >= 0)
     {
 	colnr_T	start = posmatch->pos[bot].col == 0
 					     ? 0 : posmatch->pos[bot].col - 1;
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    821,
+/**/
     820,
 /**/
     819,