summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-12-14 08:57:39 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-12-14 08:57:39 +0200
commitfa389b9098722522fa17c216375ea7ea8c5757c5 (patch)
treec23c102f0e3ca93027fbcdc8ee8b120f32b71dca /strings
parent7ab42fdd23308cd92eab14c5c1e587d5ef87c339 (diff)
parent2f959a691071b9a192c47e083618e33e8b03dd39 (diff)
downloadmariadb-git-fa389b9098722522fa17c216375ea7ea8c5757c5.tar.gz
Merge 10.9 into 10.10
Diffstat (limited to 'strings')
-rw-r--r--strings/dtoa.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/strings/dtoa.c b/strings/dtoa.c
index af2409b9195..9bdeeacf574 100644
--- a/strings/dtoa.c
+++ b/strings/dtoa.c
@@ -1478,7 +1478,10 @@ static double my_strtod_int(const char *s00, char **se, int *error, char *buf, s
L= c - '0';
s1= s;
while (++s < end && (c= *s) >= '0' && c <= '9')
- L= 10*L + c - '0';
+ {
+ if (L < 19999)
+ L= 10*L + c - '0';
+ }
if (s - s1 > 8 || L > 19999)
/* Avoid confusion from exponents
* so large that e might overflow.