Mercurial > vim
diff src/ops.c @ 13814:7ed76dcf0d94 v8.0.1779
patch 8.0.1779: deleting in a block selection causes problems
commit https://github.com/vim/vim/commit/35e802e713382d7e76232ad344af7dcd577e43de
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Apr 30 17:21:03 2018 +0200
patch 8.0.1779: deleting in a block selection causes problems
Problem: Deleting in a block selection causes problems.
Solution: Check the length of the line before adding bd.textcol and
bd.textlen. (Christian Brabandt, closes #2825)
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 30 Apr 2018 17:30:07 +0200 |
| parents | 4faf77b96432 |
| children | 1f95ec5de238 |
line wrap: on
line diff
--- a/src/ops.c +++ b/src/ops.c @@ -2703,6 +2703,8 @@ op_insert(oparg_T *oap, long count1) { struct block_def bd2; int did_indent = FALSE; + size_t len; + int add; /* If indent kicked in, the firstline might have changed * but only do that, if the indent actually increased. */ @@ -2781,9 +2783,15 @@ op_insert(oparg_T *oap, long count1) * Subsequent calls to ml_get() flush the firstline data - take a * copy of the required string. */ - firstline = ml_get(oap->start.lnum) + bd.textcol; + firstline = ml_get(oap->start.lnum); + len = STRLEN(firstline); + add = bd.textcol; if (oap->op_type == OP_APPEND) - firstline += bd.textlen; + add += bd.textlen; + if ((size_t)add > len) + firstline += len; // short line, point to the NUL + else + firstline += add; if (pre_textlen >= 0 && (ins_len = (long)STRLEN(firstline) - pre_textlen) > 0) {