d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Help to recover from bad seek (i.e. negative or too big) happens beyond

Browse Source 
our pre-check control. Do the same way as refill.c does when it set __SERR,
i.e. clear read and ungetc buffers. Clear EOF flag too.
This commit is contained in:
Andrey A. Chernov 2001-10-24 17:25:49 +00:00
parent a55dfa2ac1
commit e41febc84b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=85418
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libc/stdio/fseek.c
View File

@ -297,11 +297,6 @@ _fseeko(fp, offset, whence, ltest)
dumb:
if (__sflush(fp) || _sseek(fp, (fpos_t)offset, whence) == POS_ERR)
return (-1);
if (ltest && fp->_offset > LONG_MAX) {
fp->_flags |= __SERR;
errno = EOVERFLOW;
return (-1);
}
/* success: clear EOF indicator and discard ungetc() data */
if (HASUB(fp))
FREEUB(fp);
@ -309,5 +304,10 @@ _fseeko(fp, offset, whence, ltest)
fp->_r = 0;
/* fp->_w = 0; */ /* unnecessary (I think...) */
fp->_flags &= ~__SEOF;
if (ltest && fp->_offset > LONG_MAX) {
fp->_flags |= __SERR;
errno = EOVERFLOW;
return (-1);
}
return (0);
}

7
lib/libc/stdio/stdio.c
View File

@ -171,6 +171,13 @@ _sseek(fp, offset, whence)
*/
if (ret < 0) {
if (errret == 0) {
if (offset != 0 || whence != SEEK_CUR) {
if (HASUB(fp))
FREEUB(fp);
fp->_p = fp->_bf._base;
fp->_r = 0;
fp->_flags &= ~__SEOF;
}
fp->_flags |= __SERR;
errno = EINVAL;
} else if (errret == ESPIPE)