Fix inappropriate uses of atol()

petere · petere · commit f5a1311fccd2 · 2024-08-10T08:22:31.000+02:00
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
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
@@ -2056,7 +2056,7 @@ BaseBackup(char *compression_algorithm, char *compression_detail,
 	tablespacecount = PQntuples(res);
 	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
diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c
@@ -631,7 +631,7 @@ GetSlotInformation(PGconn *conn, const char *slot_name,
 
 	/* current TLI */
 	if (!PQgetisnull(res, 0, 2))
-		tli_loc = (TimeLineID) atol(PQgetvalue(res, 0, 2));
+		tli_loc = (TimeLineID) atoll(PQgetvalue(res, 0, 2));
 
 	PQclear(res);
 
diff --git a/src/bin/pg_rewind/libpq_source.c b/src/bin/pg_rewind/libpq_source.c
@@ -294,7 +294,7 @@ libpq_traverse_files(rewind_source *source, process_file_callback_t callback)
 		}
 
 		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);
 		link_target = PQgetvalue(res, i, 3);
 
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
@@ -278,7 +278,7 @@ ecpg_is_type_an_array(int type, const struct statement *stmt, const struct varia
 			isarray = ECPG_ARRAY_NONE;
 		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 ||
 				ecpg_dynamic_type(type) == SQL3_CHARACTER_VARYING)
 			{

Original file line number	Diff line number	Diff line change
`@@ -2056,7 +2056,7 @@ BaseBackup(char compression_algorithm, char compression_detail,`
`2056`	`2056`	`tablespacecount = PQntuples(res);`
`2057`	`2057`	`for (i = 0; i < PQntuples(res); i++)`
`2058`	`2058`	`{`
`2059`		`- totalsize_kb += atol(PQgetvalue(res, i, 2));`
	`2059`	`+ totalsize_kb += atoll(PQgetvalue(res, i, 2));`
`2060`	`2060`
`2061`	`2061`	`/*`
`2062`	`2062`	`* Verify tablespace directories are empty. Don't bother with the`
Original file line number	Diff line number	Diff line change
`@@ -294,7 +294,7 @@ libpq_traverse_files(rewind_source *source, process_file_callback_t callback)`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`path = PQgetvalue(res, i, 0);`
`297`		`- filesize = atol(PQgetvalue(res, i, 1));`
	`297`	`+ filesize = atoll(PQgetvalue(res, i, 1));`
`298`	`298`	`isdir = (strcmp(PQgetvalue(res, i, 2), "t") == 0);`
`299`	`299`	`link_target = PQgetvalue(res, i, 3);`
`300`	`300`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,7 @@ ecpg_is_type_an_array(int type, const struct statement *stmt, const struct varia`
`278`	`278`	`isarray = ECPG_ARRAY_NONE;`
`279`	`279`	`else`
`280`	`280`	`{`
`281`		`- isarray = (atol((char *) PQgetvalue(query, 0, 0)) == -1) ? ECPG_ARRAY_ARRAY : ECPG_ARRAY_VECTOR;`
	`281`	`+ isarray = (atoi((char *) PQgetvalue(query, 0, 0)) == -1) ? ECPG_ARRAY_ARRAY : ECPG_ARRAY_VECTOR;`
`282`	`282`	`if (ecpg_dynamic_type(type) == SQL3_CHARACTER \|\|`
`283`	`283`	`ecpg_dynamic_type(type) == SQL3_CHARACTER_VARYING)`
`284`	`284`	`{`