summaryrefslogtreecommitdiff
path: root/strings
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2020-08-05 08:14:49 +0400
committerAlexander Barkov <bar@mariadb.com>2020-08-05 08:14:49 +0400
commit0e80f5a6934692dd7a47b6d31104fa194bbf18ec (patch)
treeb65752de8101426747f75b570a81c365417c9a0a /strings
parenta09a06d597319c23eeeb9372c93ffc17eafefb07 (diff)
downloadmariadb-git-0e80f5a6934692dd7a47b6d31104fa194bbf18ec.tar.gz
MDEV-23105 Cast number string with many leading zeros to decimal gives unexpected result
Skip leading zeros when converting a string to decimal_t.
Diffstat (limited to 'strings')
-rw-r--r--strings/decimal.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/strings/decimal.c b/strings/decimal.c
index 56d09e8f303..dd2e1236489 100644
--- a/strings/decimal.c
+++ b/strings/decimal.c
@@ -812,6 +812,24 @@ internal_str2dec(const char *from, decimal_t *to, char **end, my_bool fixed)
while (s < end_of_string && my_isdigit(&my_charset_latin1, *s))
s++;
intg= (int) (s-s1);
+ /*
+ If the integer part is long enough and it has multiple leading zeros,
+ let's trim them, so this expression can return 1 without overflowing:
+ CAST(CONCAT(REPEAT('0',90),'1') AS DECIMAL(10))
+ */
+ if (intg > DIG_PER_DEC1 && s1[0] == '0' && s1[1] == '0')
+ {
+ /*
+ Keep at least one digit, to avoid an empty string.
+ So we trim '0000' to '0' rather than to ''.
+ Otherwise the below code (converting digits to to->buf)
+ would fail on a fatal error.
+ */
+ const char *iend= s - 1;
+ for ( ; s1 < iend && *s1 == '0'; s1++)
+ { }
+ intg= (int) (s-s1);
+ }
if (s < end_of_string && *s=='.')
{
endp= s+1;