diff options
Diffstat (limited to 'lib/libc/stdio')
| -rw-r--r-- | lib/libc/stdio/ftell.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/lib/libc/stdio/ftell.c b/lib/libc/stdio/ftell.c index abb6da1..8cf94ee 100644 --- a/lib/libc/stdio/ftell.c +++ b/lib/libc/stdio/ftell.c @@ -119,7 +119,18 @@ _ftello(FILE *fp, fpos_t *offset) if (HASUB(fp)) pos -= fp->_r; /* Can be negative at this point. */ } else if ((fp->_flags & __SWR) && fp->_p != NULL) { - if ((fp->_flags & __SAPP) || (fp->_flags2 & __S2OAP)) { + /* + * Writing. Any buffered characters cause the + * position to be greater than that in the + * underlying object. + */ + n = fp->_p - fp->_bf._base; + if (pos > OFF_MAX - n) { + errno = EOVERFLOW; + return (1); + } + if (n > 0 && + ((fp->_flags & __SAPP) || (fp->_flags2 & __S2OAP))) { int serrno = errno; errno = 0; @@ -137,16 +148,6 @@ _ftello(FILE *fp, fpos_t *offset) } errno = serrno; } - /* - * Writing. Any buffered characters cause the - * position to be greater than that in the - * underlying object. - */ - n = fp->_p - fp->_bf._base; - if (pos > OFF_MAX - n) { - errno = EOVERFLOW; - return (1); - } pos += n; } *offset = pos; |
