From nobody Sun Apr 28 00:59:58 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1494228988985863.1185021723561; Mon, 8 May 2017 00:36:28 -0700 (PDT) Received: from localhost ([::1]:58128 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7dDX-0004BR-Rh for importer@patchew.org; Mon, 08 May 2017 03:36:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36112) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d7dCj-0003q5-3y for qemu-devel@nongnu.org; Mon, 08 May 2017 03:35:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d7dCf-0005h2-5U for qemu-devel@nongnu.org; Mon, 08 May 2017 03:35:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37494) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d7dCe-0005gu-VR; Mon, 08 May 2017 03:35:33 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A65287F4BB; Mon, 8 May 2017 07:35:31 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-116-21.ams2.redhat.com [10.36.116.21]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v487ZTio030362; Mon, 8 May 2017 03:35:30 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A65287F4BB Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=pbonzini@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com A65287F4BB From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 8 May 2017 09:35:29 +0200 Message-Id: <20170508073529.23449-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 08 May 2017 07:35:31 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] xtensa: use g_malloc/g_new/g_free X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Max Filippov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Replace malloc/free with g_malloc/g_free to get a program exit on out of memory. Replace g_malloc with g_new when allocating the MemoryRegion to get more type safety. Reported by Coverity. Cc: Max Filippov Cc: qemu-trivial@nongnu.org Signed-off-by: Paolo Bonzini Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/xtensa/sim.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c index d2d1d3a6fd..97307728f7 100644 --- a/hw/xtensa/sim.c +++ b/hw/xtensa/sim.c @@ -41,13 +41,13 @@ static void xtensa_create_memory_regions(const XtensaMe= mory *memory, const char *name) { unsigned i; - char *num_name =3D malloc(strlen(name) + sizeof(i) * 3 + 1); + char *num_name =3D g_malloc(strlen(name) + sizeof(i) * 3 + 1); =20 for (i =3D 0; i < memory->num; ++i) { MemoryRegion *m; =20 sprintf(num_name, "%s%u", name, i); - m =3D g_malloc(sizeof(*m)); + m =3D g_new(MemoryRegion, 1); memory_region_init_ram(m, NULL, num_name, memory->location[i].size, &error_fatal); @@ -55,7 +55,7 @@ static void xtensa_create_memory_regions(const XtensaMemo= ry *memory, memory_region_add_subregion(get_system_memory(), memory->location[i].addr, m); } - free(num_name); + g_free(num_name); } =20 static uint64_t translate_phys_addr(void *opaque, uint64_t addr) --=20 2.12.2