diff options
| author | David Rowley <drowley@postgresql.org> | 2024-07-28 22:24:15 +1200 |
|---|---|---|
| committer | David Rowley <drowley@postgresql.org> | 2024-07-28 22:24:15 +1200 |
| commit | 0a80e88d902d3dfdeed03ede1880b8994a8d892b (patch) | |
| tree | 0fc8417fbb16d582383c03adabeb429d54226859 /src/backend/utils/adt/dbsize.c | |
| parent | 6ddc8556ce4aff68446ebe00f14930bc0bbeccca (diff) | |
| download | postgresql-0a80e88d902d3dfdeed03ede1880b8994a8d892b.tar.gz postgresql-0a80e88d902d3dfdeed03ede1880b8994a8d892b.zip | |
Fix incorrect return value for pg_size_pretty(bigint)
pg_size_pretty(bigint) would return the value in bytes rather than PB
for the smallest-most bigint value. This happened due to an incorrect
assumption that the absolute value of -9223372036854775808 could be
stored inside a signed 64-bit type.
Here we fix that by instead storing that value in an unsigned 64-bit type.
This bug does exist in versions prior to 15 but the code there is
sufficiently different and the bug seems sufficiently non-critical that
it does not seem worth risking backpatching further.
Author: Joseph Koshakow <koshy44@gmail.com>
Discussion: https://postgr.es/m/CAAvxfHdTsMZPWEHUrZ=h3cky9Ccc3Mtx2whUHygY+ABP-mCmUw@mail.gmail.com
Backpatch-through: 15
Diffstat (limited to 'src/backend/utils/adt/dbsize.c')
| -rw-r--r-- | src/backend/utils/adt/dbsize.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/backend/utils/adt/dbsize.c b/src/backend/utils/adt/dbsize.c index b4a2c8d2197..9b01d9e3fbe 100644 --- a/src/backend/utils/adt/dbsize.c +++ b/src/backend/utils/adt/dbsize.c @@ -562,9 +562,13 @@ pg_size_pretty(PG_FUNCTION_ARGS) for (unit = size_pretty_units; unit->name != NULL; unit++) { uint8 bits; + uint64 abs_size = size < 0 ? 0 - (uint64) size : (uint64) size; - /* use this unit if there are no more units or we're below the limit */ - if (unit[1].name == NULL || Abs(size) < unit->limit) + /* + * Use this unit if there are no more units or the absolute size is + * below the limit for the current unit. + */ + if (unit[1].name == NULL || abs_size < unit->limit) { if (unit->round) size = half_rounded(size); |