diff options
author | Bram Moolenaar <Bram@vim.org> | 2018-04-30 17:21:03 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2018-04-30 17:21:03 +0200 |
commit | 35e802e713382d7e76232ad344af7dcd577e43de (patch) | |
tree | 07ddbdc3c26ccdaf45ae1f7b7f7d2b831afeb1f6 /src/ops.c | |
parent | b07bbb0d29493fcf4ed080fe018535e64441d663 (diff) |
patch 8.0.1779: deleting in a block selection causes problemsv8.0.1779
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)
Diffstat (limited to 'src/ops.c')
-rw-r--r-- | src/ops.c | 12 |
1 files changed, 10 insertions, 2 deletions
@@ -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) { |