From a1a20f029299dc27170912bb9233070c8403444d Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 21 Jan 2020 17:11:01 +0100 Subject: resolv: Fix file handle leak in __resolv_conf_load [BZ #25429] res_vinit_1 did not close the stream on errors, only on success. This change moves closing the stream to __resolv_conf_load, for both the success and error cases. Fixes commit 89f187a40fc0ad4e22838526bfe34d73f758b776 ("resolv: Use getline for configuration file reading in res_vinit_1") and commit 3f853f22c87f0b671c0366eb290919719fa56c0e ("resolv: Lift domain search list limits [BZ #19569] [BZ #21475]"), where memory allocation was introduced into res_vinit_1. Reviewed-by: Adhemerval Zanella --- resolv/res_init.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'resolv') diff --git a/resolv/res_init.c b/resolv/res_init.c index 95dce098aa..09345718cd 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -508,7 +508,6 @@ res_vinit_1 (FILE *fp, struct resolv_conf_parser *parser) continue; } } - fclose (fp); } if (__glibc_unlikely (nameserver_list_size (&parser->nameserver_list) == 0)) { @@ -593,6 +592,13 @@ __resolv_conf_load (struct __res_state *preinit) } resolv_conf_parser_free (&parser); + if (fp != NULL) + { + int saved_errno = errno; + fclose (fp); + __set_errno (saved_errno); + } + return conf; } -- cgit v1.2.3