diff options
| author | Michael Paquier | 2020-07-22 23:29:08 +0000 |
|---|---|---|
| committer | Michael Paquier | 2020-07-22 23:29:08 +0000 |
| commit | 38f60f174e3279069b5547b5f4015eb4a8492037 (patch) | |
| tree | a2815210c9179278a29b3a6a7fd8002bc3a2ad2c /contrib/pgcrypto/pgp-compress.c | |
| parent | a57d312a7706321d850faa048a562a0c0c01b835 (diff) | |
Revert "Fix corner case with PGP decompression in pgcrypto"
This reverts commit 9e10898, after finding out that buildfarm members
running SLES 15 on z390 complain on the compression and decompression
logic of the new test: pipistrelles, barbthroat and steamerduck.
Those hosts are visibly using hardware-specific changes to improve zlib
performance, requiring more investigation.
Thanks to Tom Lane for the discussion.
Discussion: https://postgr.es/m/20200722093749.GA2564@paquier.xyz
Backpatch-through: 9.5
Diffstat (limited to 'contrib/pgcrypto/pgp-compress.c')
| -rw-r--r-- | contrib/pgcrypto/pgp-compress.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/contrib/pgcrypto/pgp-compress.c b/contrib/pgcrypto/pgp-compress.c index 17f5b2ef93d..0505bdee923 100644 --- a/contrib/pgcrypto/pgp-compress.c +++ b/contrib/pgcrypto/pgp-compress.c @@ -243,17 +243,6 @@ decompress_read(void *priv, PullFilter *src, int len, struct DecomprData *dec = priv; restart: - if (dec->stream.avail_in == 0) - { - uint8 *tmp; - - res = pullf_read(src, 8192, &tmp); - if (res < 0) - return res; - dec->stream.next_in = tmp; - dec->stream.avail_in = res; - } - if (dec->buf_data > 0) { if (len > dec->buf_data) @@ -267,6 +256,17 @@ restart: if (dec->eof) return 0; + if (dec->stream.avail_in == 0) + { + uint8 *tmp; + + res = pullf_read(src, 8192, &tmp); + if (res < 0) + return res; + dec->stream.next_in = tmp; + dec->stream.avail_in = res; + } + dec->stream.next_out = dec->buf; dec->stream.avail_out = dec->buf_len; dec->pos = dec->buf; |