postgres.git / summary / log / commit / refs

commit    1243aa9b2f2e8a23f5fbace2b038b962bf79e9f0
Author:   Joe Conway <mail@joeconway.com>
Date:     Sat Jul 04 17:47:31 2020 +0000
First released in: 14.0, 11.9, 12.4, 13.0

    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


 src/backend/utils/adt/genfile.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c
index 37e90d2302a..2f6aba78b7e 100644
--- a/src/backend/utils/adt/genfile.c
+++ b/src/backend/utils/adt/genfile.c
@@ -165,8 +165,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")));


[parent: c2cdaf0cb912]