database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

better overflow checks in decimal2ulonglong

Browse Source 
better truncation check in decimal2ulonglong
This commit is contained in:
serg@serg.mylan
2004-11-27 12:35:21 +01:00
parent 7dabb64176
commit 57eb9f0021
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
strings/decimal.c
View File

@@ -503,7 +503,7 @@ int decimal2ulonglong(decimal *from, ulonglong *to)
{ {
dec1 *buf=from->buf; dec1 *buf=from->buf;
ulonglong x=0; ulonglong x=0;
int intg; int intg, frac;
if (from->sign) if (from->sign)
{ {
@@ -515,14 +515,17 @@ int decimal2ulonglong(decimal *from, ulonglong *to)
{ {
ulonglong y=x; ulonglong y=x;
x=x*DIG_BASE + *buf++; x=x*DIG_BASE + *buf++;
if (unlikely(x < y)) if (unlikely(y > (ULONGLONG_MAX/DIG_BASE) || x < y))
{ {
*to=y; *to=y;
return E_DEC_OVERFLOW; return E_DEC_OVERFLOW;
} }
} }
*to=x; *to=x;
return from->frac ? E_DEC_TRUNCATED : E_DEC_OK; for (frac=from->frac; unlikely(frac > 0); frac-=DIG_PER_DEC1)
if (*buf++)
return E_DEC_TRUNCATED;
return E_DEC_OK;
} }
int decimal2longlong(decimal *from, longlong *to) int decimal2longlong(decimal *from, longlong *to)
@@ -1928,6 +1931,7 @@ main()
test_d2ull("18446744073709551616"); test_d2ull("18446744073709551616");
test_d2ull("-1"); test_d2ull("-1");
test_d2ull("1.23"); test_d2ull("1.23");
test_d2ull("9999999999999999999999999.000");
printf("==== longlong2decimal ====\n"); printf("==== longlong2decimal ====\n");
test_ll2d(LL(-12345)); test_ll2d(LL(-12345));