summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Paquier <michael@paquier.xyz>2022-09-14 14:52:36 +0900
committerMichael Paquier <michael@paquier.xyz>2022-09-14 14:52:36 +0900
commita9e99ff6b4ac46f78d4d173d2720ed453dda1331 (patch)
tree6a3e0d1320f1c04855c178f2fbc28a8b5e2c2a83
parent2864f77556110529f294951382a8d67201244758 (diff)
downloadpostgresql-a9e99ff6b4ac46f78d4d173d2720ed453dda1331.tar.gz
Fix incorrect value for "strategy" with deflateParams() in walmethods.c
The zlib documentation mentions the values supported for the compression strategy, but this code has been using a hardcoded value of 0 rather than Z_DEFAULT_STRATEGY. This commit adjusts the code to use Z_DEFAULT_STRATEGY. Backpatch down to where this code has been added to ease the backport of any future patch touching this area. Reported-by: Tom Lane Discussion: https://postgr.es/m/1400032.1662217889@sss.pgh.pa.us Backpatch-through: 10
-rw-r--r--src/bin/pg_basebackup/walmethods.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/bin/pg_basebackup/walmethods.c b/src/bin/pg_basebackup/walmethods.c
index 3151a88117..49af3cbc32 100644
--- a/src/bin/pg_basebackup/walmethods.c
+++ b/src/bin/pg_basebackup/walmethods.c
@@ -701,7 +701,7 @@ tar_open_for_write(const char *pathname, const char *temp_suffix, size_t pad_to_
return NULL;
/* Turn off compression for header */
- if (deflateParams(tar_data->zp, 0, 0) != Z_OK)
+ if (deflateParams(tar_data->zp, 0, Z_DEFAULT_STRATEGY) != Z_OK)
{
tar_set_error("could not change compression parameters");
return NULL;
@@ -739,7 +739,8 @@ tar_open_for_write(const char *pathname, const char *temp_suffix, size_t pad_to_
return NULL;
/* Re-enable compression for the rest of the file */
- if (deflateParams(tar_data->zp, tar_data->compression, 0) != Z_OK)
+ if (deflateParams(tar_data->zp, tar_data->compression,
+ Z_DEFAULT_STRATEGY) != Z_OK)
{
tar_set_error("could not change compression parameters");
return NULL;
@@ -953,7 +954,7 @@ tar_close(Walfile f, WalCloseMethod method)
else
{
/* Turn off compression */
- if (deflateParams(tar_data->zp, 0, 0) != Z_OK)
+ if (deflateParams(tar_data->zp, 0, Z_DEFAULT_STRATEGY) != Z_OK)
{
tar_set_error("could not change compression parameters");
return -1;
@@ -964,7 +965,8 @@ tar_close(Walfile f, WalCloseMethod method)
return -1;
/* Turn compression back on */
- if (deflateParams(tar_data->zp, tar_data->compression, 0) != Z_OK)
+ if (deflateParams(tar_data->zp, tar_data->compression,
+ Z_DEFAULT_STRATEGY) != Z_OK)
{
tar_set_error("could not change compression parameters");
return -1;