diff options
| author | Rich Felker <dalias@aerifal.cx> | 2012-04-16 01:55:37 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2012-04-16 01:55:37 -0400 |
| commit | f007bb854b0b2d2d12cd45a8feb674fa9abe70b2 (patch) | |
| tree | c65aaf26f436fa5ebdba13453c3d8ece3a942026 | |
| parent | 2ac580fdfe1daf9924f221dc98878ae480306bfa (diff) | |
| download | musl-f007bb854b0b2d2d12cd45a8feb674fa9abe70b2.tar.gz musl-f007bb854b0b2d2d12cd45a8feb674fa9abe70b2.tar.xz musl-f007bb854b0b2d2d12cd45a8feb674fa9abe70b2.zip | |
fix broken shgetc limiter logic (wasn't working)
| -rw-r--r-- | src/internal/shgetc.c | 5 | ||||
| -rw-r--r-- | src/internal/shgetc.h | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/internal/shgetc.c b/src/internal/shgetc.c index 82e3a4fa..e85d38ac 100644 --- a/src/internal/shgetc.c +++ b/src/internal/shgetc.c @@ -13,7 +13,10 @@ void __shlim(FILE *f, off_t lim) int __shgetc(FILE *f) { int c; - if (f->shcnt >= f->shlim) return EOF; + if (f->shlim && f->shcnt >= f->shlim) { + f->shend = 0; + return EOF; + } c = __uflow(f); if (f->shlim && f->rend - f->rpos > f->shlim - f->shcnt - 1) f->shend = f->rpos + (f->shlim - f->shcnt - 1); diff --git a/src/internal/shgetc.h b/src/internal/shgetc.h index 0543cb0d..7beb8ce6 100644 --- a/src/internal/shgetc.h +++ b/src/internal/shgetc.h @@ -6,4 +6,4 @@ int __shgetc(FILE *); #define shcnt(f) ((f)->shcnt + ((f)->rpos - (f)->rend)) #define shlim(f, lim) __shlim((f), (lim)) #define shgetc(f) (((f)->rpos < (f)->shend) ? *(f)->rpos++ : __shgetc(f)) -#define shunget(f) ((f)->rend ? (void)(f)->rpos-- : (void)0) +#define shunget(f) ((f)->shend ? (void)(f)->rpos-- : (void)0) |