diff options
| author |   Florian Weimer <fweimer@redhat.com> | 2020-01-21 17:11:01 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2020-02-14 08:13:58 +0100 |
| commit | a1a20f029299dc27170912bb9233070c8403444d (patch) | |
| tree | 58caad17547053524bee65848c564ea1c0fc8f81 /resolv | |
| parent | resolv: Use <file_change_detection.h> in __resolv_conf_get_current (diff) | |
| download | glibc-a1a20f029299dc27170912bb9233070c8403444d.tar.gz glibc-a1a20f029299dc27170912bb9233070c8403444d.tar.bz2 glibc-a1a20f029299dc27170912bb9233070c8403444d.zip | |
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 <adhemerval.zanella@linaro.org>
Diffstat (limited to 'resolv')
| -rw-r--r-- | resolv/res_init.c | 8 |
1 files changed, 7 insertions, 1 deletions
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; } |