From patchwork Fri Feb 4 20:01:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 81943 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id B5AD1B712D for ; Sat, 5 Feb 2011 07:02:56 +1100 (EST) Received: from localhost ([127.0.0.1]:39987 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PlRrq-0004qt-5k for incoming@patchwork.ozlabs.org; Fri, 04 Feb 2011 15:02:54 -0500 Received: from [140.186.70.92] (port=35887 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PlRqc-0004GF-Gp for qemu-devel@nongnu.org; Fri, 04 Feb 2011 15:01:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PlRqb-0003Ou-J2 for qemu-devel@nongnu.org; Fri, 04 Feb 2011 15:01:38 -0500 Received: from moutng.kundenserver.de ([212.227.126.171]:50568) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PlRqb-0003Kc-58 for qemu-devel@nongnu.org; Fri, 04 Feb 2011 15:01:37 -0500 Received: from flocke.fritz.box (p54AD9EA2.dip.t-dialin.net [84.173.158.162]) by mrelayeu.kundenserver.de (node=mreu0) with ESMTP (Nemesis) id 0Mg2LJ-1PXLEX3Ow1-00NRpy; Fri, 04 Feb 2011 21:01:25 +0100 Received: from stefan by flocke.fritz.box with local (Exim 4.72) (envelope-from ) id 1PlRqN-0001wM-Eu; Fri, 04 Feb 2011 21:01:23 +0100 From: Stefan Weil To: QEMU Developers Date: Fri, 4 Feb 2011 21:01:16 +0100 Message-Id: <1296849676-7429-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.7.2.3 X-Provags-ID: V02:K0:QPsZXF43fUHwo4hlMLoDl6AGYXaiwa4hUaGqGVCLQiE BFc6ljO/ueLsWoERANSXIQ0GvhZGT/sczWkm37OhssszmlbNw6 BvEhXirSHrzc9A1IihxD9uCTuxcFLQAydstgG13Qjfra83AlH0 uJXTM5RjZIiV9X0HHRMAm+FoVTQd/J1vlwmJAnBTuYkFU3bAAp R4aimkOaV6abL7kN909yxhimlhASGiyEzVUlbwtWuJAFyqqmIX ieRDjMkrgUJWC X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.227.126.171 Cc: Kevin Wolf Subject: [Qemu-devel] [PATCH] block/vdi: Fix wrong size in conditionally used memset, memcmp X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Error report from cppcheck: block/vdi.c:122: error: Using sizeof for array given as function argument returns the size of pointer. block/vdi.c:128: error: Using sizeof for array given as function argument returns the size of pointer. Fix both by setting the correct size. The buggy code is only used when QEMU is build without uuid support. The bug is not critical, so there is no urgent need to apply it to old versions of QEMU. Cc: Kevin Wolf Signed-off-by: Stefan Weil --- block/vdi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block/vdi.c b/block/vdi.c index 83b9c04..083266e 100644 --- a/block/vdi.c +++ b/block/vdi.c @@ -119,13 +119,13 @@ void uuid_unparse(const uuid_t uu, char *out); #if !defined(CONFIG_UUID) void uuid_generate(uuid_t out) { - memset(out, 0, sizeof(out)); + memset(out, 0, sizeof(uuid_t)); } int uuid_is_null(const uuid_t uu) { uuid_t null_uuid = { 0 }; - return memcmp(uu, null_uuid, sizeof(uu)) == 0; + return memcmp(uu, null_uuid, sizeof(uuid_t)) == 0; } void uuid_unparse(const uuid_t uu, char *out)