patch 8.2.3575: overflow check still fails when sizeof(int) == sizeof(long)

Problem:    Overflow check still fails when sizeof(int) == sizeof(long).
Solution:   Use a float to check the result.

diff --git a/src/register.c b/src/register.c
index 4160c03107faeef363c9075d8e0eb888f201190f..0afa363ecafe5237c5d3f338c9868e6e93aaaa70 100644 (file)
--- a/src/register.c
+++ b/src/register.c
@@ -2011,12 +2011,18 @@ do_put(
            }
 
            do {
+#ifdef FEAT_FLOAT
+               double multlen = (double)count * (double)yanklen;
+
+               totlen = count * yanklen;
+               if ((double)totlen != multlen)
+#else
                long multlen = count * yanklen;
 
+               // this only works when sizeof(int) != sizeof(long)
                totlen = multlen;
-               if (count != 0 && yanklen != 0
-                       && (totlen != multlen || totlen / count != yanklen
-                                                || totlen / yanklen != count))
+               if (totlen != multlen)
+#endif
                {
                    emsg(_(e_resulting_text_too_long));
                    break;

diff --git a/src/version.c b/src/version.c
index 98f666e6e405a85c1c9e9afcc5372eab89ec93a9..27331c95dc2cf35e063ba19323384c0378d42013 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -757,6 +757,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    3575,
 /**/
     3574,
 /**/