thirdparty/util-linux
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

lib/strutils: fix uint64_t overflow

Browse source 
Addresses: https://github.com/karelzak/util-linux/issues/998
Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2020-04-17 10:21:56 +02:00
parent 316617e848
commit f12d5ad279
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/strutils.c
View file

@ -603,7 +603,10 @@ char *size_to_human_string(int options, uint64_t bytes)
/* round */
if (frac) {
/* get 3 digits after decimal point */
frac = (frac * 1000) / (1ULL << exp);
if (frac >= UINT64_MAX / 1000)
frac = ((frac / 1024) * 1000) / (1ULL << (exp - 10)) ;
else
frac = (frac * 1000) / (1ULL << (exp)) ;
if (options & SIZE_DECIMAL_2DIGITS) {
/* round 4/5 and keep 2 digits after decimal point */