From 3d52ff41ae4835d47a0ddfaa6dfb3a2dabe92faf Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Tue, 28 Jun 2022 09:01:45 +0000
Subject: [PATCH] if we can't open the user db, don't try to read from a closed
 fh

---
 usr.sbin/pkg_add/OpenBSD/PkgCreate.pm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm
index b5f88fcec73..592a19b4360 100644
--- a/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm
+++ b/usr.sbin/pkg_add/OpenBSD/PkgCreate.pm
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 # ex:ts=8 sw=4:
-# $OpenBSD: PkgCreate.pm,v 1.181 2022/06/28 08:47:10 espie Exp $
+# $OpenBSD: PkgCreate.pm,v 1.182 2022/06/28 09:01:45 espie Exp $
 #
 # Copyright (c) 2003-2014 Marc Espie <espie@openbsd.org>
 #
@@ -48,6 +48,7 @@ sub error
 	my $msg = shift;
 	$self->{bad}++;
 	$self->progress->disable;
+	# XXX the actual format is $msg.
 	$self->errsay("Error: $msg", @_);
 }
 
@@ -140,8 +141,12 @@ sub parse_userdb
 {
 	my ($self, $fname) = @_;
 	my $result = {};
-	open(my $fh, '<', $fname) or 
+	my $bad = 0;
+	open(my $fh, '<', $fname) or $bad = 1;
+	if ($bad) {
 		$self->error("Can't open #1: #2", $fname, $!);
+		return;
+	}
 	# skip header
 	my $separator_found = 0;
 	while (<$fh>) {
-- 
2.20.1