git: 77d678b7a407 - main - Fix a memory leak from caf73e58579
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 28 May 2022 19:19:14 UTC
The branch main has been updated by asomers:
URL: https://cgit.FreeBSD.org/src/commit/?id=77d678b7a4075a056be621b46be50377f08bfc9e
commit 77d678b7a4075a056be621b46be50377f08bfc9e
Author: Alan Somers <asomers@FreeBSD.org>
AuthorDate: 2022-05-28 19:17:37 +0000
Commit: Alan Somers <asomers@FreeBSD.org>
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