From 70158ed8bc74ce80a049c1beb71e85ae949778b2 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Tue, 10 Jan 2017 20:07:02 +0100 Subject: Refuse infinite writes to regular files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- src/stream.c | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) (limited to 'src/stream.c') diff --git a/src/stream.c b/src/stream.c index e99d003..cb487ad 100644 --- a/src/stream.c +++ b/src/stream.c @@ -2,17 +2,12 @@ #include "stream.h" #include "util.h" +#include #include #include #include #include -void -einit_stream(struct stream *stream) -{ - eninit_stream(1, stream); -} - void eninit_stream(int status, struct stream *stream) { @@ -103,12 +98,6 @@ set_pixel_size(struct stream *stream) return 0; } -void -eset_pixel_size(struct stream *stream) -{ - enset_pixel_size(1, stream); -} - void enset_pixel_size(int status, struct stream *stream) { @@ -126,12 +115,8 @@ fprint_stream_head(FILE *fp, struct stream *stream) } -size_t eread_stream(struct stream *stream, size_t n) -{ - return enread_stream(1, stream, n); -} - -size_t enread_stream(int status, struct stream *stream, size_t n) +size_t +enread_stream(int status, struct stream *stream, size_t n) { ssize_t r = read(stream->fd, stream->buf + stream->ptr, sizeof(stream->buf) - stream->ptr < n ? @@ -141,3 +126,14 @@ size_t enread_stream(int status, struct stream *stream, size_t n) stream->ptr += (size_t)r; return (size_t)r; } + + +void +eninf_check_fd(int status, int fd, const char *file) +{ + struct stat st; + if (fstat(fd, &st)) + eprintf("fstat %s:", file); + if (S_ISREG(st.st_mode)) + eprintf("%s is a regular file, refusing infinite write\n"); +} -- cgit v1.2.3-70-g09d2