From a83047308196e3e54716a39dd85c0a08b198d6bd Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 6 Sep 2017 15:32:43 +0200 Subject: [PATCH] resolv: __resolv_conf_attach must not free passed conf object [BZ #22096] --- ChangeLog | 6 ++++++ resolv/resolv_conf.c | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 298f0fdcbd..6150ba16d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2017-09-06 Florian Weimer + + [BZ #22096] + * resolv/resolv_conf.c (__resolv_conf_attach): Do not free conf in + case of failure to obtain the global conf object. + 2017-09-06 Florian Weimer [BZ #22095] diff --git a/resolv/resolv_conf.c b/resolv/resolv_conf.c index f391d30c27..e0f296d02e 100644 --- a/resolv/resolv_conf.c +++ b/resolv/resolv_conf.c @@ -600,10 +600,7 @@ __resolv_conf_attach (struct __res_state *resp, struct resolv_conf *conf) struct resolv_conf_global *global_copy = get_locked_global (); if (global_copy == NULL) - { - free (conf); - return false; - } + return false; /* Try to find an unused index in the array. */ size_t index;