From patchwork Wed May 30 07:46:21 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Meyering X-Patchwork-Id: 161881 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 28714B7046 for ; Wed, 30 May 2012 17:47:52 +1000 (EST) Received: from localhost ([::1]:56162 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZddF-0000IF-By for incoming@patchwork.ozlabs.org; Wed, 30 May 2012 03:47:49 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47445) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZdcr-0008KH-Bw for qemu-devel@nongnu.org; Wed, 30 May 2012 03:47:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SZdck-0001e3-2n for qemu-devel@nongnu.org; Wed, 30 May 2012 03:47:24 -0400 Received: from mx.meyering.net ([88.168.87.75]:49289 helo=hx.meyering.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SZdcj-0001dt-Nx for qemu-devel@nongnu.org; Wed, 30 May 2012 03:47:17 -0400 Received: from hx.meyering.net (hx.meyering.net [127.0.0.1]) by hx.meyering.net (8.14.5/8.14.5) with ESMTP id q4U7lEeU013962; Wed, 30 May 2012 09:47:15 +0200 Received: (from meyering@localhost) by hx.meyering.net (8.14.5/8.14.5/Submit) id q4U7lEiP013961; Wed, 30 May 2012 09:47:14 +0200 From: Jim Meyering To: qemu-devel@nongnu.org Date: Wed, 30 May 2012 09:46:21 +0200 Message-Id: <1338364001-13892-3-git-send-email-jim@meyering.net> X-Mailer: git-send-email 1.7.10.2.605.gbefc5ed In-Reply-To: <1338364001-13892-1-git-send-email-jim@meyering.net> References: <1338364001-13892-1-git-send-email-jim@meyering.net> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 88.168.87.75 Cc: Jim Meyering Subject: [Qemu-devel] [PATCHv2 02/22] sparc: use g_strdup in place of unchecked strdup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Jim Meyering This avoids a NULL-deref upon strdup failure. Also update matching free to g_free. Signed-off-by: Jim Meyering --- target-sparc/cpu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target-sparc/cpu.c b/target-sparc/cpu.c index 7ac6bdb..1e31318 100644 --- a/target-sparc/cpu.c +++ b/target-sparc/cpu.c @@ -648,7 +648,7 @@ static int cpu_sparc_find_by_name(sparc_def_t *cpu_def, const char *cpu_model) { unsigned int i; const sparc_def_t *def = NULL; - char *s = strdup(cpu_model); + char *s = g_strdup(cpu_model); char *featurestr, *name = strtok(s, ","); uint32_t plus_features = 0; uint32_t minus_features = 0; @@ -740,7 +740,7 @@ static int cpu_sparc_find_by_name(sparc_def_t *cpu_def, const char *cpu_model) #ifdef DEBUG_FEATURES print_features(stderr, fprintf, cpu_def->features, NULL); #endif - free(s); + g_free(s); return 0; error: