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 e39f7fa357099d818bea87afefba9b3f321d1d4c..628ccc9bddc4f3ea9297c6731d4ea157197adca7 100644 (file)
--- 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);