summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-05-18 12:49:40 +0200
committerBram Moolenaar <Bram@vim.org>2012-05-18 12:49:40 +0200
commit18e00d2c86e609101ef8ae637991c6a29bdb511c (patch)
tree6d5a4f643a84a43d88708899da826e07527947ee
parent2fc8802fcc42449555ee565819c8a3f06e070895 (diff)
downloadvim-18e00d2c86e609101ef8ae637991c6a29bdb511c.zip
updated for version 7.3.517
Problem: Crash when using "vipvv". (Alexandre Provencio) Solution: Don't let the text length become negative.
-rw-r--r--src/ops.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/ops.c b/src/ops.c
index bccac7790..bc2860a0d 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -3042,6 +3042,8 @@ op_yank(oap, deleting, mess)
}
#endif
}
+ if (endcol == MAXCOL)
+ endcol = (colnr_T)STRLEN(p);
if (startcol > endcol
#ifdef FEAT_VIRTUALEDIT
|| is_oneChar
@@ -3050,8 +3052,6 @@ op_yank(oap, deleting, mess)
bd.textlen = 0;
else
{
- if (endcol == MAXCOL)
- endcol = (colnr_T)STRLEN(p);
bd.textlen = endcol - startcol + oap->inclusive;
}
bd.textstart = p + startcol;
diff --git a/src/version.c b/src/version.c
index 5b4bbfc3e..0f40176e0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 517,
+/**/
516,
/**/
515,