database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-25 21:42:33 +03:00
Code

Fix inappropriate uses of atol()

Browse Source 
Some code using atol() would not work correctly if sizeof(long)==4:

- src/bin/pg_basebackup/pg_basebackup.c: Would miscount size of a
  tablespace over 2 TB.

- src/bin/pg_basebackup/streamutil.c: Would truncate a timeline ID
  beyond INT32_MAX.

- src/bin/pg_rewind/libpq_source.c: Would miscount size of files
  larger than 2 GB (but this currently cannot happen).

Replace these with atoll().

In one case, the use of atol() did not result in incorrect behavior
but seems inconsistent with related code:

- src/interfaces/ecpg/ecpglib/execute.c: Gratuitous, since it
  processes a value from pg_type.typlen, which is int16.

Replace this with atoi().

Reviewed-by: Heikki Linnakangas <hlinnaka@iki.fi>
Discussion: https://www.postgresql.org/message-id/flat/a52738ad-06bc-4d45-b59f-b38a8a89de49%40eisentraut.org
This commit is contained in:
Peter Eisentraut 2024-08-10 08:12:44 +02:00
parent 7adec2d5fc
commit f5a1311fcc
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/pg_basebackup/pg_basebackup.c
View File

@ -2056,7 +2056,7 @@ BaseBackup(char *compression_algorithm, char *compression_detail,
tablespacecount = PQntuples(res); tablespacecount = PQntuples(res);
for (i = 0; i < PQntuples(res); i++) for (i = 0; i < PQntuples(res); i++)
{ {
totalsize_kb += atol(PQgetvalue(res, i, 2)); totalsize_kb += atoll(PQgetvalue(res, i, 2));
/* /*
* Verify tablespace directories are empty. Don't bother with the * Verify tablespace directories are empty. Don't bother with the

2
src/bin/pg_basebackup/streamutil.c
View File

@ -631,7 +631,7 @@ GetSlotInformation(PGconn *conn, const char *slot_name,
/* current TLI */ /* current TLI */
if (!PQgetisnull(res, 0, 2)) if (!PQgetisnull(res, 0, 2))
tli_loc = (TimeLineID) atol(PQgetvalue(res, 0, 2)); tli_loc = (TimeLineID) atoll(PQgetvalue(res, 0, 2));
PQclear(res); PQclear(res);

2
src/bin/pg_rewind/libpq_source.c
View File

@ -294,7 +294,7 @@ libpq_traverse_files(rewind_source *source, process_file_callback_t callback)
} }
path = PQgetvalue(res, i, 0); path = PQgetvalue(res, i, 0);
filesize = atol(PQgetvalue(res, i, 1)); filesize = atoll(PQgetvalue(res, i, 1));
isdir = (strcmp(PQgetvalue(res, i, 2), "t") == 0); isdir = (strcmp(PQgetvalue(res, i, 2), "t") == 0);
link_target = PQgetvalue(res, i, 3); link_target = PQgetvalue(res, i, 3);

2
src/interfaces/ecpg/ecpglib/execute.c
View File

@ -278,7 +278,7 @@ ecpg_is_type_an_array(int type, const struct statement *stmt, const struct varia
isarray = ECPG_ARRAY_NONE; isarray = ECPG_ARRAY_NONE;
else else
{ {
isarray = (atol((char *) PQgetvalue(query, 0, 0)) == -1) ? ECPG_ARRAY_ARRAY : ECPG_ARRAY_VECTOR; isarray = (atoi((char *) PQgetvalue(query, 0, 0)) == -1) ? ECPG_ARRAY_ARRAY : ECPG_ARRAY_VECTOR;
if (ecpg_dynamic_type(type) == SQL3_CHARACTER || if (ecpg_dynamic_type(type) == SQL3_CHARACTER ||
ecpg_dynamic_type(type) == SQL3_CHARACTER_VARYING) ecpg_dynamic_type(type) == SQL3_CHARACTER_VARYING)
{ {