From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Wed, 31 May 2023 08:28:28 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1q4FJu-003s59-6y for lore@lore.pengutronix.de; Wed, 31 May 2023 08:28:28 +0200 Received: from bombadil.infradead.org ([2607:7c80:54:3::133]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1q4FJr-0006qX-VQ for lore@pengutronix.de; Wed, 31 May 2023 08:28:28 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=GU+KlsywKi9Sy65d7yTZlNk6HxFrYp4zUOI7qT2HSYw=; b=JT2TWG+woUbMD4R7HIsUw4zF2S GIxE+QXxh/lfN8MfCVwQw6alOWD4j+GjtGs8tz7nRBsJrQ86IlDclP6obh+lsjkn6tkDTPL+Ct6i5 fVv6VsxWH5T3dPJE3zoeofQxXLf2HbXTe8247dyDNKI0sMShIzIOTcCdmM1e0Qs2hK7busFdMlS8T gJ27wu6uDPGgHI8fqzzxm3XMsOOZoThox63Zlav51hg1aklE1daFI/UqR/ljZLdC0TWM91GO0bUp5 MTCusD+/g4P+JKMp/kpQEpiME11ow8iswpWAzUFhT0mNs7dl+G8MrO8EK5pYrY1C7eGfCa0cgE7na xdnxmc4g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q4FIm-00GHen-2O; Wed, 31 May 2023 06:27:20 +0000 Received: from relay1-d.mail.gandi.net ([217.70.183.193]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q4FIh-00GHca-0l for barebox@lists.infradead.org; Wed, 31 May 2023 06:27:16 +0000 X-GND-Sasl: ahmad@a3f.at X-GND-Sasl: ahmad@a3f.at Received: by mail.gandi.net (Postfix) with ESMTPSA id 9C753240008; Wed, 31 May 2023 06:27:08 +0000 (UTC) From: Ahmad Fatoum To: barebox@lists.infradead.org Cc: Ahmad Fatoum Date: Wed, 31 May 2023 08:27:02 +0200 Message-Id: <20230531062703.670521-2-ahmad@a3f.at> X-Mailer: git-send-email 2.38.5 In-Reply-To: <20230531062703.670521-1-ahmad@a3f.at> References: <20230531062703.670521-1-ahmad@a3f.at> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230530_232715_425806_D64A68F3 X-CRM114-Status: GOOD ( 10.31 ) X-BeenThere: barebox@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "barebox" X-SA-Exim-Connect-IP: 2607:7c80:54:3::133 X-SA-Exim-Mail-From: barebox-bounces+lore=pengutronix.de@lists.infradead.org X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-5.2 required=4.0 tests=AWL,BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Subject: [PATCH master 2/3] scripts: kwbimage: check return value of asprintf X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on metis.ext.pengutronix.de) Some newer toolchains defines asprintf with a must_check attribute, leading to warnings when compiling kwbimage. Let's handle OOM gracefully to get rid of the warnings. Signed-off-by: Ahmad Fatoum --- scripts/kwbimage.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/scripts/kwbimage.c b/scripts/kwbimage.c index f9d052752d79..370c54c983b5 100644 --- a/scripts/kwbimage.c +++ b/scripts/kwbimage.c @@ -1006,6 +1006,7 @@ static int image_create_config_parse_oneline(char *line, char *configpath) { char *keyword, *saveptr; + int ret; keyword = strtok_r(line, " ", &saveptr); if (!strcmp(keyword, "VERSION")) { @@ -1056,10 +1057,16 @@ static int image_create_config_parse_oneline(char *line, int argi = 0; el->type = IMAGE_CFG_BINARY; - if (*value == '/') + if (*value == '/') { el->binary.file = strdup(value); - else - asprintf(&el->binary.file, "%s/%s", configpath, value); + } else { + ret = asprintf(&el->binary.file, "%s/%s", configpath, value); + if (ret < 0) { + fprintf(stderr, "Cannot allocate memory\n"); + return -1; + } + } + while (1) { value = strtok_r(NULL, " ", &saveptr); if (!value) -- 2.38.5