upstream/postgresql
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-04-05 01:07:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix multiple bugs in astreamer pipeline code.

Browse source 
astreamer_tar_parser_content() sent the wrong data pointer when
forwarding MEMBER_TRAILER padding to the next streamer.  After
astreamer_buffer_until() buffers the padding bytes, the 'data'
pointer has been advanced past them, but the code passed 'data'
instead of bbs_buffer.data.  This caused the downstream consumer
to receive bytes from after the padding rather than the padding
itself, and could read past the end of the input buffer.

astreamer_gzip_decompressor_content() only checked for
Z_STREAM_ERROR from inflate(), silently ignoring Z_DATA_ERROR
(corrupted data) and Z_MEM_ERROR (out of memory).  Fix by
treating any return other than Z_OK, Z_STREAM_END, and
Z_BUF_ERROR as fatal.

astreamer_gzip_decompressor_free() missed calling inflateEnd() to
release zlib's internal decompression state.

astreamer_tar_parser_free() neglected to pfree() the streamer
struct itself, leaking it.

astreamer_extractor_content() did not check the return value of
fclose() when closing an extracted file.  A deferred write error
(e.g., disk full on buffered I/O) would be silently lost.

Discussion: https://postgr.es/m/results/98c6b630-acbb-44a7-97fa-1692ce2b827c@dunslane.net

Reviewed-By: Tom Lane <tgl@sss.pgh.pa.us>

Backpatch-through: 15
This commit is contained in:
Andrew Dunstan 2026-03-29 09:06:54 -04:00
parent 351e59f344
commit f1298a4c20
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/bin/pg_basebackup/bbstreamer_file.c
View file

@ -263,7 +263,9 @@ bbstreamer_extractor_content(bbstreamer *streamer, bbstreamer_member *member,
case BBSTREAMER_MEMBER_TRAILER:
if (mystreamer->file == NULL)
break;
fclose(mystreamer->file);
if (fclose(mystreamer->file) != 0)
pg_fatal("could not close file \"%s\": %m",
mystreamer->filename);
mystreamer->file = NULL;
break;

10
src/bin/pg_basebackup/bbstreamer_gzip.c
View file

@ -292,8 +292,9 @@ bbstreamer_gzip_decompressor_content(bbstreamer *streamer,
*/
res = inflate(zs, Z_NO_FLUSH);
if (res == Z_STREAM_ERROR)
pg_fatal("could not decompress data: %s", zs->msg);
if (res != Z_OK && res != Z_STREAM_END && res != Z_BUF_ERROR)
pg_fatal("could not decompress data: %s",
zs->msg ? zs->msg : "unknown error");
mystreamer->bytes_written =
mystreamer->base.bbs_buffer.maxlen - zs->avail_out;
@ -338,7 +339,12 @@ bbstreamer_gzip_decompressor_finalize(bbstreamer *streamer)
static void
bbstreamer_gzip_decompressor_free(bbstreamer *streamer)
{
bbstreamer_gzip_decompressor *mystreamer;
mystreamer = (bbstreamer_gzip_decompressor *) streamer;
bbstreamer_free(streamer->bbs_next);
inflateEnd(&mystreamer->zstream);
pfree(streamer->bbs_buffer.data);
pfree(streamer);
}

4
src/bin/pg_basebackup/bbstreamer_tar.c
View file

@ -224,7 +224,8 @@ bbstreamer_tar_parser_content(bbstreamer *streamer, bbstreamer_member *member,
/* OK, now we can send it. */
bbstreamer_content(mystreamer->base.bbs_next,
&mystreamer->member,
data, mystreamer->pad_bytes_expected,
mystreamer->base.bbs_buffer.data,
mystreamer->pad_bytes_expected,
BBSTREAMER_MEMBER_TRAILER);
/* Expect next file header. */
@ -342,6 +343,7 @@ bbstreamer_tar_parser_free(bbstreamer *streamer)
{
pfree(streamer->bbs_buffer.data);
bbstreamer_free(streamer->bbs_next);
pfree(streamer);
}
/*