From 500c6886c654fd45e4926990fee2c61d816be197 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Wed, 10 Feb 2016 19:44:19 -0500 Subject: [PATCH] fix return value for fread/fwrite when size argument is 0 when the size argument was zero but nmemb was nonzero, these functions were returning nmemb, despite no data having been written. conceptually this is not wrong, but the standard requires a return value of zero in this case. --- src/stdio/fread.c | 1 + src/stdio/fwrite.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/stdio/fread.c b/src/stdio/fread.c index 33a65f58..aef75f73 100644 --- a/src/stdio/fread.c +++ b/src/stdio/fread.c @@ -7,6 +7,7 @@ size_t fread(void *restrict destv, size_t size, size_t nmemb, FILE *restrict f) { unsigned char *dest = destv; size_t len = size*nmemb, l = len, k; + if (!size) nmemb = 0; FLOCK(f); diff --git a/src/stdio/fwrite.c b/src/stdio/fwrite.c index fa30c0d3..7a567b2c 100644 --- a/src/stdio/fwrite.c +++ b/src/stdio/fwrite.c @@ -28,6 +28,7 @@ size_t __fwritex(const unsigned char *restrict s, size_t l, FILE *restrict f) size_t fwrite(const void *restrict src, size_t size, size_t nmemb, FILE *restrict f) { size_t k, l = size*nmemb; + if (!size) nmemb = 0; FLOCK(f); k = __fwritex(src, l, f); FUNLOCK(f); -- 2.40.0