From: Alan T. DeKok <aland@freeradius.org>
Date: Fri, 13 Mar 2026 11:51:13 +0000 (-0400)
Subject: correct error path when failing to open file
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17dc4fa78f5d7f39d00584415f553f200c5e7955;p=thirdparty%2Ffreeradius-server.git

correct error path when failing to open file
---

diff --git a/src/lib/server/cf_file.c b/src/lib/server/cf_file.c
index e39f7fa3570..628ccc9bddc 100644
--- a/src/lib/server/cf_file.c
+++ b/src/lib/server/cf_file.c
@@ -619,9 +619,11 @@ static int cf_file_open(CONF_SECTION *cs, char const *filename, bool from_dir, F
 			if (my_fd != AT_FDCWD) close(my_fd);
 			return 1;
 		}
+
 		fd = openat(my_fd, r, O_RDONLY, 0);
-		fp = (fd < 0) ? NULL : fdopen(fd, "r");
 		if (my_fd != AT_FDCWD) close(my_fd);
+		if (fd < 0) goto error;
+		fp = fdopen(fd, "r");
 	} else {
 		fp = fopen(filename, "r");
 		if (fp) fd = fileno(fp);