diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-11-02 23:11:00 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-11-02 23:11:00 +0000 |
| commit | e551ccfb9311eea5252d1c3106ff7a53c762d994 (patch) | |
| tree | d8e258859f3742c85e4b8725cd83a966668a2d81 /src | |
| parent | 8a1962d1355096af55e84b1ea2f0baf5f1c5a5bc (diff) | |
patch 8.2.3575: overflow check still fails when sizeof(int) == sizeof(long)v8.2.3575
Problem: Overflow check still fails when sizeof(int) == sizeof(long).
Solution: Use a float to check the result.
Diffstat (limited to 'src')
| -rw-r--r-- | src/register.c | 12 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/register.c b/src/register.c index 4160c03107..0afa363eca 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 98f666e6e4..27331c95dc 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3575, +/**/ 3574, /**/ 3573, |