diff options
author | Rich Felker <dalias@aerifal.cx> | 2018-09-16 13:46:46 -0400 |
---|---|---|
committer | Rich Felker <dalias@aerifal.cx> | 2018-09-16 14:37:22 -0400 |
commit | 849e7603e9004fd292a93df64dd3524025f2987a (patch) | |
tree | 4a8e8b168be59045998b430f7654464025affeaf /src/stdio/fseek.c | |
parent | 5cd309f0cc3c92f3fabbaa499652a8329137c4de (diff) | |
download | musl-849e7603e9004fd292a93df64dd3524025f2987a.tar.gz |
fix null pointer subtraction and comparison in stdio
morally, for null pointers a and b, a-b, a<b, and a>b should all be
defined as 0; however, C does not define any of them.
the stdio implementation makes heavy use of such pointer comparison
and subtraction for buffer logic, and also uses null pos/base/end
pointers to indicate that the FILE is not in the corresponding (read
or write) mode ready for accesses through the buffer.
all of the comparisons are fixed trivially by using != in place of the
relational operators, since the opposite relation (e.g. pos>end) is
logically impossible. the subtractions have been reviewed to check
that they are conditional the stream being in the appropriate reading-
or writing-through-buffer mode, with checks added where needed.
in fgets and getdelim, the checks added should improve performance for
unbuffered streams by avoiding a do-nothing call to memchr, and should
be negligible for buffered streams.
Diffstat (limited to 'src/stdio/fseek.c')
-rw-r--r-- | src/stdio/fseek.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/stdio/fseek.c b/src/stdio/fseek.c index 67d75f7a..439308f7 100644 --- a/src/stdio/fseek.c +++ b/src/stdio/fseek.c @@ -3,10 +3,10 @@ int __fseeko_unlocked(FILE *f, off_t off, int whence) { /* Adjust relative offset for unread data in buffer, if any. */ - if (whence == SEEK_CUR) off -= f->rend - f->rpos; + if (whence == SEEK_CUR && f->rend) off -= f->rend - f->rpos; /* Flush write buffer, and report error on failure. */ - if (f->wpos > f->wbase) { + if (f->wpos != f->wbase) { f->write(f, 0, 0); if (!f->wpos) return -1; } |