From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ABA25C433F5 for ; Wed, 13 Oct 2021 15:47:51 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 29163610CE for ; Wed, 13 Oct 2021 15:47:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 29163610CE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 01A59835EA; Wed, 13 Oct 2021 17:47:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="jMN4WwV+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BBD8F835F9; Wed, 13 Oct 2021 17:46:23 +0200 (CEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CFDB1835E6 for ; Wed, 13 Oct 2021 17:46:12 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=kabel@kernel.org Received: by mail.kernel.org (Postfix) with ESMTPSA id A531C611B0; Wed, 13 Oct 2021 15:46:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634139971; bh=h7qJeOwOSOCQAE5YOLnkOrB3rjMebq5/qNnBTYs2spA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jMN4WwV+IaKGh0bpITZyH+xpB2VzBJNbD+u6ZK2+dC/KkYLGgZYUNmfDWvB6HDgt7 /AXfG1D9cwK5xkZXrY55mv6Tw3JgyptttNSFKDPAIMU4+B2ak6G219VSRHYfgfHRqM TBs+hoKEPm0L6By9xkz/+8e7MuK6aWLXA6UljLVVYD0CG4KO/n8PDkMzFtCkXwkITM VgWGsjvuh5UbIrTcfOF7rOz6rM8X+fGFe3/Gek0EZKhvl3ZpJm/Eid+VYCHbuiUKk6 fUplB0NI0OEQrAhkRd8gS6jGy1GuoA+DUnXhNSfFrFGnly0zf/1yxORy/Txj2jScHn MXQqLrFFMzeXA== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Simon Glass , Tom Rini Cc: U-Boot Mailing List , =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH v2 08/13] env: Early return from env_get_f() on NULL name Date: Wed, 13 Oct 2021 17:45:52 +0200 Message-Id: <20211013154557.28479-9-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211013154557.28479-1-kabel@kernel.org> References: <20211013154557.28479-1-kabel@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean From: Marek Behún Test non-NULL name immediately, not in env_match(). Signed-off-by: Marek Behún --- cmd/nvedit.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cmd/nvedit.c b/cmd/nvedit.c index 9f0caceadf..7c99a693ea 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -708,13 +708,11 @@ char *from_env(const char *envvar) static int env_match(const char *env, const char *s1, int i2) { - if (s1 == NULL || *s1 == '\0') - return -1; - while (*s1 == env[i2++] && *s1 != '\0') if (*s1++ == '=') return i2; + /* We can look at env[i2-1] because i2 was incremented at least once. */ if (*s1 == '\0' && env[i2-1] == '=') return i2; @@ -729,6 +727,9 @@ int env_get_f(const char *name, char *buf, unsigned len) const char *env; int i, nxt; + if (name == NULL || *name == '\0') + return -1; + if (gd->env_valid == ENV_INVALID) env = (const char *)default_environment; else -- 2.32.0