From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([208.118.235.92]:34739)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1SWQiu-0004f2-6F
	for qemu-devel@nongnu.org; Mon, 21 May 2012 07:24:29 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1SWQip-0007HZ-D1
	for qemu-devel@nongnu.org; Mon, 21 May 2012 07:24:23 -0400
Received: from mx1.redhat.com ([209.132.183.28]:9990)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kwolf@redhat.com>) id 1SWQip-0007HH-5J
	for qemu-devel@nongnu.org; Mon, 21 May 2012 07:24:19 -0400
Message-ID: <4FBA25DD.1080701@redhat.com>
Date: Mon, 21 May 2012 13:24:13 +0200
From: Kevin Wolf <kwolf@redhat.com>
MIME-Version: 1.0
References: <87bolhn67l.fsf@rho.meyering.net>
In-Reply-To: <87bolhn67l.fsf@rho.meyering.net>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCHv2 1/6] qcow2: don't leak buffer for
 unexpected qcow_version in header
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Jim Meyering <jim@meyering.net>
Cc: qemu list <qemu-devel@nongnu.org>

Am 21.05.2012 13:06, schrieb Jim Meyering:
> 
> Signed-off-by: Jim Meyering <meyering@redhat.com>
> ---
> Thanks to Kevin Wolf for the improvement.
> 
>  block/qcow2.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/block/qcow2.c b/block/qcow2.c
> index 655799c..c2e49cd 100644
> --- a/block/qcow2.c
> +++ b/block/qcow2.c
> @@ -919,7 +919,8 @@ int qcow2_update_header(BlockDriverState *bs)
>          ret = sizeof(*header);
>          break;
>      default:
> -        return -EINVAL;
> +        ret = -EINVAL;
> +        goto fail;
>      }
> 
>      buf += ret;
> --
> 1.7.10.2.552.gaa3bb87

Acked-by: Kevin Wolf <kwolf@redhat.com>