X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Finternal%2Fshgetc.c;h=96f72b6ab476fb65b14ca54db460241ece857ecb;hb=fcaec912ed406659832f452e71a6c965308362dd;hp=82e3a4fa69152097e5c231edf8d4d8d1c82786f6;hpb=cc00f05632e5d7cbfb8ce49f4b0dfd59c3cf611d;p=musl

diff --git a/src/internal/shgetc.c b/src/internal/shgetc.c
index 82e3a4fa..96f72b6a 100644
--- a/src/internal/shgetc.c
+++ b/src/internal/shgetc.c
@@ -4,7 +4,7 @@ void __shlim(FILE *f, off_t lim)
 {
 	f->shlim = lim;
 	f->shcnt = f->rend - f->rpos;
-	if (lim && f->rend - f->rpos > lim)
+	if (lim && f->shcnt > lim)
 		f->shend = f->rpos + lim;
 	else
 		f->shend = f->rend;
@@ -13,12 +13,14 @@ void __shlim(FILE *f, off_t lim)
 int __shgetc(FILE *f)
 {
 	int c;
-	if (f->shcnt >= f->shlim) return EOF;
-	c = __uflow(f);
+	if (f->shlim && f->shcnt >= f->shlim || (c=__uflow(f)) < 0) {
+		f->shend = 0;
+		return EOF;
+	}
 	if (f->shlim && f->rend - f->rpos > f->shlim - f->shcnt - 1)
 		f->shend = f->rpos + (f->shlim - f->shcnt - 1);
 	else
 		f->shend = f->rend;
-	if (f->rend) f->shcnt += f->rend - f->buf;
+	if (f->rend) f->shcnt += f->rend - f->rpos + 1;
 	return c;
 }