mirrors/musl
1
0
Fork 0
mirror of https://git.musl-libc.org/git/musl synced 2025-02-03 03:45:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix buggy limiter handling in shgetc

Browse Source 
this is needed for upcoming new scanf
This commit is contained in:
Rich Felker 2012-04-16 15:36:18 -04:00
parent 0d5df2df4f
commit cc762434d9
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/internal/shgetc.c
View File

@ -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,15 +13,14 @@ void __shlim(FILE *f, off_t lim)
int __shgetc(FILE *f)
{
int c;
if (f->shlim && f->shcnt >= f->shlim) {
if (f->shlim && f->shcnt >= f->shlim || (c=__uflow(f)) < 0) {
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);
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;
}