updated for version 7.3.517

Problem:    Crash when using "vipvv". (Alexandre Provencio)
Solution:   Don't let the text length become negative.

diff --git a/src/ops.c b/src/ops.c
index bccac779043d339c64b77ec299746640dabaa377..bc2860a0d3612e8b4c2a846c0abc545ef7681e02 100644 (file)
--- 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 5b4bbfc3e714a0923f5fc180e7ca274c0ee850f2..0f40176e0530a1c3737136da3fcdca34ab9782b4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    517,
 /**/
     516,
 /**/