diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-02-18 20:54:15 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-02-18 20:54:15 -0500 |
| commit | b1d079c83b3dd459114d1ba7c2ff1b07a9ee3e9e (patch) | |
| tree | e80358ae4795597680b45fe984dc5f2e9ce20237 /src/nvim/edit.c | |
| parent | 366662d932551e558d10f09887ddf144ed5db34b (diff) | |
| parent | 36340803afe1504f15468a715172c25cfef6974c (diff) | |
| download | rneovim-b1d079c83b3dd459114d1ba7c2ff1b07a9ee3e9e.tar.gz rneovim-b1d079c83b3dd459114d1ba7c2ff1b07a9ee3e9e.tar.bz2 rneovim-b1d079c83b3dd459114d1ba7c2ff1b07a9ee3e9e.zip | |
Merge #1979 'Enable -Wconversion'
Diffstat (limited to 'src/nvim/edit.c')
| -rw-r--r-- | src/nvim/edit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index fa4e4b2835..7913a37d2c 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -6594,9 +6594,10 @@ int in_cinkeys(int keytyped, int when, int line_is_empty) for (s = line + curwin->w_cursor.col; s > line; --s) if (!vim_iswordc(s[-1])) break; + assert(p >= look && (uintmax_t)(p - look) <= SIZE_MAX); if (s + (p - look) <= line + curwin->w_cursor.col && (icase - ? MB_STRNICMP(s, look, p - look) + ? mb_strnicmp(s, look, (size_t)(p - look)) : STRNCMP(s, look, p - look)) == 0) match = TRUE; } else @@ -6605,10 +6606,11 @@ int in_cinkeys(int keytyped, int when, int line_is_empty) && TOLOWER_LOC(keytyped) == TOLOWER_LOC((int)p[-1]))) { line = get_cursor_pos_ptr(); + assert(p >= look && (uintmax_t)(p - look) <= SIZE_MAX); if ((curwin->w_cursor.col == (colnr_T)(p - look) || !vim_iswordc(line[-(p - look) - 1])) && (icase - ? MB_STRNICMP(line - (p - look), look, p - look) + ? mb_strnicmp(line - (p - look), look, (size_t)(p - look)) : STRNCMP(line - (p - look), look, p - look)) == 0) match = TRUE; |