Follow @Openwall on Twitter for new release announcements and other news
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date: Tue, 12 Mar 2019 20:32:05 -0400
From: Rich Felker <dalias@...c.org>
To: musl@...ts.openwall.com
Subject: Re: [PATCH] setvbuf: return failure if mode is invalid

On Tue, Mar 12, 2019 at 03:31:22PM -0500, A. Wilcox wrote:
> POSIX requires setvbuf to return non-zero if `mode` is not one of _IONBF,
> _IOLBF, or _IOFBF.
> ---
>  src/stdio/setvbuf.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/src/stdio/setvbuf.c b/src/stdio/setvbuf.c
> index 06ea296c..523dddc8 100644
> --- a/src/stdio/setvbuf.c
> +++ b/src/stdio/setvbuf.c
> @@ -12,13 +12,15 @@ int setvbuf(FILE *restrict f, char *restrict buf, int type, size_t size)
>  
>  	if (type == _IONBF) {
>  		f->buf_size = 0;
> -	} else {
> +	} else if (type == _IOLBF || type == _IOFBF) {
>  		if (buf && size >= UNGET) {
>  			f->buf = (void *)(buf + UNGET);
>  			f->buf_size = size - UNGET;
>  		}
>  		if (type == _IOLBF && f->buf_size)
>  			f->lbf = '\n';
> +	} else {
> +		return -1;
>  	}
>  
>  	f->flags |= F_SVB;
> -- 
> 2.19.2

Thanks; will commit. FWIW this seems to be a C requirement not
specific to POSIX.

Rich

Powered by blists - more mailing lists

Confused about mailing lists and their use? Read about mailing lists on Wikipedia and check out these guidelines on proper formatting of your messages.