sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-10 00:01:28 -04:00
Code Issues Projects Releases Wiki Activity

Fix pg_size_pretty() to avoid overflow for inputs close to INT64_MAX.

Browse Source 
The expression that tried to round the value to the nearest TB could
overflow, leading to bogus output as reported in bug #5993 from Nicola
Cossu.  This isn't likely to ever happen in the intended usage of the
function (if it could, we'd be needing to use a wider datatype instead);
but it's not hard to give the expected output, so let's do so.
This commit is contained in:
Tom Lane 2011-04-25 16:22:24 -04:00
parent 3c34d7ee8e
commit 049e8b07fa
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/backend/utils/adt/dbsize.c
View File

@ -427,9 +427,15 @@ pg_size_pretty(PG_FUNCTION_ARGS)
(size + mult / 2) / mult); (size + mult / 2) / mult);
else else
{ {
/* Here we have to worry about avoiding overflow */
int64 val;
mult *= 1024; mult *= 1024;
val = size / mult;
if ((size % mult) >= (mult / 2))
val++;
snprintf(VARDATA(result), 50, INT64_FORMAT " TB", snprintf(VARDATA(result), 50, INT64_FORMAT " TB",
(size + mult / 2) / mult); val);
} }
} }
} }