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

Simplify offset underflow checks even more

Browse Source
This commit is contained in:
Andrey A. Chernov 2001-08-31 20:17:32 +00:00
parent 4fd606bfba
commit c4b2cc78e3
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/libc/stdio/ftell.c
View File

@ -114,8 +114,8 @@ _ftello(fp)
* those from ungetc) cause the position to be
* smaller than that in the underlying object.
*/
pos -= fp->_r;
if (pos < 0) {
if ((pos -= fp->_r) < 0 ||
(HASUB(fp) && (pos -= fp->_ur) < 0)) {
fp->_p = fp->_bf._base;
fp->_r = 0;
if (HASUB(fp))
@ -123,16 +123,6 @@ _ftello(fp)
if (spos == -1)
goto get_real_pos;
pos = spos;
} else if (HASUB(fp)) {
pos -= fp->_ur;
if (pos < 0) {
fp->_p = fp->_bf._base;
fp->_r = 0;
FREEUB(fp);
if (spos == -1)
goto get_real_pos;
pos = spos;
}
}
} else if ((fp->_flags & __SWR) && fp->_p != NULL) {
/*