From: Rich Felker <dalias@aerifal.cx>
Date: Sun, 17 Jul 2011 01:24:02 +0000 (-0400)
Subject: fix logic error in fread
X-Git-Tag: v0.8.0~96
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=94a0171d807dc94302d6505041fc58879c27f3bd;p=oweals%2Fmusl.git

fix logic error in fread

fread was calling f->read without checking that the file was in
reading mode. this could:
1. crash, if f->read was a null pointer
2. cause unwanted blocking on a terminal already at eof
3. allow reading on a write-only file
---

diff --git a/src/stdio/fread.c b/src/stdio/fread.c
index 8105fe99..5c235777 100644
--- a/src/stdio/fread.c
+++ b/src/stdio/fread.c
@@ -21,14 +21,9 @@ size_t fread(void *destv, size_t size, size_t nmemb, FILE *f)
 		l -= k;
 	}
 	
-	if (!l) {
-		FUNLOCK(f);
-		return nmemb;
-	}
-
 	/* Read the remainder directly */
 	for (; l; l-=k, dest+=k) {
-		k = f->read(f, dest, l);
+		k = __toread(f) ? 0 : f->read(f, dest, l);
 		if (k+1<=1) {
 			FUNLOCK(f);
 			return (len-l)/size;