Improve more comments in astreamer_gzip.c.
Duplicate the comment from astreamer_plain_writer_new instead of just referring to it. Add a further note to mention that there are dangers if anything else is written to the same FILE. Also add a comment where we dup() the filehandle, referring to the existing comment in astreamer_gzip_writer_finalize(), because the dup() looks wrong on first glance without that comment to clarify. Per concerns expressed by Tom Lane on pgsql-security, and using some wording suggested by him. Discussion: http://postgr.es/m/CA+TgmoYTFAD0YTh4HC1Nuhn0YEyoQi0_CENFgVzAY_YReiSksQ@mail.gmail.com
This commit is contained in:
parent
b8b3f861fb
commit
76dd015e85
@ -86,9 +86,16 @@ static const astreamer_ops astreamer_gzip_decompressor_ops = {
|
|||||||
* Create a astreamer that just compresses data using gzip, and then writes
|
* Create a astreamer that just compresses data using gzip, and then writes
|
||||||
* it to a file.
|
* it to a file.
|
||||||
*
|
*
|
||||||
* As in the case of astreamer_plain_writer_new, pathname is always used
|
* The caller must specify a pathname and may specify a file. The pathname is
|
||||||
* for error reporting purposes; if file is NULL, it is also the opened and
|
* used for error-reporting purposes either way. If file is NULL, the pathname
|
||||||
* closed so that the data may be written there.
|
* also identifies the file to which the data should be written: it is opened
|
||||||
|
* for writing and closed when done. If file is not NULL, the data is written
|
||||||
|
* there.
|
||||||
|
*
|
||||||
|
* Note that zlib does not use the FILE interface, but operates directly on
|
||||||
|
* a duplicate of the underlying fd. Hence, callers must take care if they
|
||||||
|
* plan to write any other data to the same FILE, either before or after using
|
||||||
|
* this.
|
||||||
*/
|
*/
|
||||||
astreamer *
|
astreamer *
|
||||||
astreamer_gzip_writer_new(char *pathname, FILE *file,
|
astreamer_gzip_writer_new(char *pathname, FILE *file,
|
||||||
@ -112,6 +119,10 @@ astreamer_gzip_writer_new(char *pathname, FILE *file,
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
|
* We must dup the file handle so that gzclose doesn't break the
|
||||||
|
* caller's FILE. See comment for astreamer_gzip_writer_finalize.
|
||||||
|
*/
|
||||||
int fd = dup(fileno(file));
|
int fd = dup(fileno(file));
|
||||||
|
|
||||||
if (fd < 0)
|
if (fd < 0)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user