diff options
| author | Joe Conway <mail@joeconway.com> | 2020-07-04 13:47:07 -0400 |
|---|---|---|
| committer | Joe Conway <mail@joeconway.com> | 2020-07-04 13:47:07 -0400 |
| commit | c536da177cbbc9e30de17a0a445b53d79a5bbe7f (patch) | |
| tree | 77584877e53e07ace29b5304d847af8311b53ee5 | |
| parent | 0025c3a2c295459002711e0b37e48e3b067a83ba (diff) | |
| download | postgresql-c536da177cbbc9e30de17a0a445b53d79a5bbe7f.tar.gz postgresql-c536da177cbbc9e30de17a0a445b53d79a5bbe7f.zip | |
Fix "ignoring return value" complaints from commit 96d1f423f9
The cfbot and some BF animals are complaining about the previous
read_binary_file commit because of ignoring return value of ‘fread’.
So let's make everyone happy by testing the return value even though
not strictly needed.
Reported by Justin Pryzby, and suggested patch by Tom Lane. Backpatched
to v11 same as the previous commit.
Reported-By: Justin Pryzby
Reviewed-By: Tom Lane
Discussion: https://postgr.es/m/flat/969b8d82-5bb2-5fa8-4eb1-f0e685c5d736%40joeconway.com
Backpatch-through: 11
| -rw-r--r-- | src/backend/utils/adt/genfile.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c index 7a691875ddf..c1cc19d1f5c 100644 --- a/src/backend/utils/adt/genfile.c +++ b/src/backend/utils/adt/genfile.c @@ -168,8 +168,7 @@ read_binary_file(const char *filename, int64 seek_offset, int64 bytes_to_read, { char rbuf[1]; - fread(rbuf, 1, 1, file); - if (!feof(file)) + if (fread(rbuf, 1, 1, file) != 0 || !feof(file)) ereport(ERROR, (errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED), errmsg("file length too large"))); |