summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-12-13 11:37:33 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-12-13 11:37:33 +0200
commitfdf43b5c78c4aeb26efdbef3172746e007ab6f1d (patch)
tree7497fd0a024da01b2ade9c45e484a9d004a3f13b /strings
parent382e85fe70cfffb6c7190c627647c19aed3912a5 (diff)
parent8f30973234de520d95dfccca8409e5802b845331 (diff)
downloadmariadb-git-fdf43b5c78c4aeb26efdbef3172746e007ab6f1d.tar.gz
Merge 10.3 into 10.4
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 e31b7e92d7c..13e28821f69 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.