diff options
| author | ache <ache@FreeBSD.org> | 2007-06-18 02:09:08 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 2007-06-18 02:09:08 +0000 |
| commit | c24c6ce809b3237f681ebdec5b3dfbfe9ee6efa8 (patch) | |
| tree | b1aec635d864f9732db8c13466e0d106b30dccd9 /lib/libc/stdio/fseek.c | |
| parent | c7ee2c66ef026d9121744c95b363c1a9022d668b (diff) | |
| download | FreeBSD-src-c24c6ce809b3237f681ebdec5b3dfbfe9ee6efa8.zip FreeBSD-src-c24c6ce809b3237f681ebdec5b3dfbfe9ee6efa8.tar.gz | |
Add mbstate clear missed in one of the cases.
Move overflow check for fseek as early as needed.
Diffstat (limited to 'lib/libc/stdio/fseek.c')
| -rw-r--r-- | lib/libc/stdio/fseek.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/libc/stdio/fseek.c b/lib/libc/stdio/fseek.c index c13b697..8482d0d 100644 --- a/lib/libc/stdio/fseek.c +++ b/lib/libc/stdio/fseek.c @@ -283,6 +283,7 @@ abspos: fp->_r -= n; } fp->_flags &= ~__SEOF; + memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t)); return (0); /* @@ -293,6 +294,11 @@ dumb: if (__sflush(fp) || (ret = _sseek(fp, (fpos_t)offset, whence)) == POS_ERR) return (-1); + if (ltest && ret > LONG_MAX) { + fp->_flags |= __SERR; + errno = EOVERFLOW; + return (-1); + } /* success: clear EOF indicator and discard ungetc() data */ if (HASUB(fp)) FREEUB(fp); @@ -301,10 +307,5 @@ dumb: /* fp->_w = 0; */ /* unnecessary (I think...) */ fp->_flags &= ~__SEOF; memset(&fp->_extra->mbstate, 0, sizeof(mbstate_t)); - if (ltest && ret > LONG_MAX) { - fp->_flags |= __SERR; - errno = EOVERFLOW; - return (-1); - } return (0); } |
