Re: [Qemu-devel] [PATCH v5 10/10] block/vvfat: fix setbuf stream parameter may be NULL

[Stefan Hajnoczi]

On Mon, Aug 11, 2014 at 04:53:09PM +0800, zhanghailiang wrote:
> From: Li Liu <address@hidden>
> 
> fopen() may return NULL which will cause setbuf() segmentfault
> 
> Signed-off-by: zhanghailiang <address@hidden>
> Signed-off-by: Li Liu <address@hidden>
> ---
>  block/vvfat.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/block/vvfat.c b/block/vvfat.c
> index 70176b1..6889ea9 100644
> --- a/block/vvfat.c
> +++ b/block/vvfat.c
> @@ -1084,7 +1084,10 @@ static int vvfat_open(BlockDriverState *bs, QDict 
> *options, int flags,
>  
>  DLOG(if (stderr == NULL) {
>      stderr = fopen("vvfat.log", "a");
> -    setbuf(stderr, NULL);
> +
> +    if (stderr) {
> +        setbuf(stderr, NULL);
> +    }
>  })
>  
>      opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);

This no longer exists:

commit 13b552c2f43298a42e26d7aec7b58a5c205b75a0
Author: Michael Tokarev <address@hidden>
Date:   Wed Aug 20 19:02:38 2014 +0400

    block/vvfat.c: remove debugging code to reinit stderr if NULL
    
    Just log to stderr unconditionally, like other similar code does.
    
    Signed-off-by: Michael Tokarev <address@hidden>
    Reviewed-by: Peter Maydell <address@hidden>
    Signed-off-by: Kevin Wolf <address@hidden>

pgp3uwKxQqmgc.pgp
Description: PGP signature