From a83047308196e3e54716a39dd85c0a08b198d6bd Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Wed, 6 Sep 2017 15:32:43 +0200
Subject: resolv: __resolv_conf_attach must not free passed conf object [BZ
 #22096]

---
 resolv/resolv_conf.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'resolv')

diff --git a/resolv/resolv_conf.c b/resolv/resolv_conf.c
index f391d30c2..e0f296d 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;
-- 
cgit v1.1