From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 2 Nov 2021 23:11:00 +0000 (+0000)
Subject: patch 8.2.3575: overflow check still fails when sizeof(int) == sizeof(long)
X-Git-Tag: v8.2.3575
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e551ccfb9311eea5252d1c3106ff7a53c762d994;p=vim

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 4160c0310..0afa363ec 100644
--- 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 98f666e6e..27331c95d 100644
--- 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,
 /**/