From nobody Sat May 28 19:19:14 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 89C8B1B56586; Sat, 28 May 2022 19:19:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L9Wgk3T50z4ZV5; Sat, 28 May 2022 19:19:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653765554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RUGw8TsM0X4wTnmIBQNHBtSrWkXaBheu6fbYgP1Y0cg=; b=kTBXd77ug+WmRvBY/SQxFKt2YrQfleviRR+FdeIt3Ja3R5KNE2fzcL5tv/N6TNgX2DGvZ0 0OTXeBPaf2xL9I596wJPLh7+SpUiFzOGYQy0F6kcAAhdhq4fY5KFQ+9Sp5CaJDM7jH9GkT cfx9GYIb8hJ3859Emonx+w/ZWsQXaP1PR3tfKQmbtI5PzyTuAay+9DeYEIW1DdAab7oUC9 1NW/e3ZOAWHmU+mt+RvVPyYKS0LtMqNJYchADs6/fALQKFOcn7ao+0218/kKu2voRiCnZk gpUsm9j2jVNYWKfWcNHqGZz4QaPdlCmbi1C5oBEK8OYwapQHWL9Tg9EPFT2yMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 532AD14C86; Sat, 28 May 2022 19:19:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24SJJEUj066114; Sat, 28 May 2022 19:19:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24SJJE2A066113; Sat, 28 May 2022 19:19:14 GMT (envelope-from git) Date: Sat, 28 May 2022 19:19:14 GMT Message-Id: <202205281919.24SJJE2A066113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 77d678b7a407 - main - Fix a memory leak from caf73e58579 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77d678b7a4075a056be621b46be50377f08bfc9e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1653765554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RUGw8TsM0X4wTnmIBQNHBtSrWkXaBheu6fbYgP1Y0cg=; b=psaJuwJUTviSUSTu44oT648QxhypgHGSaV6vTm78gZFiHuDnGCCJ+YOAm0L50IFBnlSAsv sWF2yqAg5cW7uuYaeZPjkCvEeCfTcSnb6kQJ2lul2GQ+UIl+4ruHPJ8Yu2P6OgoEbgMSDa MKqZnhU5iCXF1Gy2TCQAIrhdyry/J1D3jANlqUvhnoN0rBGhewTJLDiSgUjn2OTnaUj6Ry R6wUTrcfP3apPcttmQ3wTDT6lzH2zcitJxbwDIUgPcrTmS1zu6dyeTT1SCt9ObJFZMm1nn B6qFp7k+R7zOwJg2DPMEe4V7KzEsYxNHwRdfsnP8HYvzuct2J6Uj21tCr7t45g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1653765554; a=rsa-sha256; cv=none; b=TJN1rXC/K0stIFjqwUQAfvCYYEEzgodn/Hk3B7epXmzj57gEg+mvNnnDuzng+codcaBUwm lMUJgd4y6otApV2vKpjgBORgiyX2R6dJXSCeiNJay8tyQjWS3vyNR+PlwmHVoxS2fxlka0 Kfld/sNMkOxsf/Rpqrb2ggEaLbjhZ1Sh3yqaZR21x5J1nVBXZa6hHF2qmwRmrhgjILx0z1 o+d3Adw37i2dQczBKM1bId9UG0XkjnGo1fTYFNNczAqlT+wIj1jQlOIxpB2TaYKMRJr+tV N8udtJ2TV2JREbJ9woaNn/qic8yCwe9xwwpKkI+G7Nz2aKYveJnjN5L7MZR6/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=77d678b7a4075a056be621b46be50377f08bfc9e commit 77d678b7a4075a056be621b46be50377f08bfc9e Author: Alan Somers AuthorDate: 2022-05-28 19:17:37 +0000 Commit: Alan Somers CommitDate: 2022-05-28 19:17:37 +0000 Fix a memory leak from caf73e58579 Don't shadow an already-local variable with another local declaration. Reported by: dteske MFC after: 13 days MFC with: caf73e58579343fc1661f43554b30115bb940535 Sponsored by: Axcient Differential Revision: https://reviews.freebsd.org/D35331 --- usr.sbin/bsdinstall/scripts/zfsboot | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bsdinstall/scripts/zfsboot b/usr.sbin/bsdinstall/scripts/zfsboot index 40973f737761..dc9d35feaa78 100755 --- a/usr.sbin/bsdinstall/scripts/zfsboot +++ b/usr.sbin/bsdinstall/scripts/zfsboot @@ -667,7 +667,8 @@ dialog_menu_layout() for disk in $ZFSBOOT_DISKS; do debug= f_device_find -1 \ $disk $DEVICE_TYPE_DISK disk - local _${disk}_status + f_isset _${disk}_status || + local _${disk}_status setvar _${disk}_status on done