resolv: __resolv_conf_attach must not free passed conf object [BZ #22096]

This commit is contained in:
Florian Weimer 2017-09-06 15:32:43 +02:00
parent 5670c4ab25
commit a830473081
2 changed files with 7 additions and 4 deletions

View File

@ -1,3 +1,9 @@
2017-09-06 Florian Weimer <fweimer@redhat.com>
[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 <fweimer@redhat.com>
[BZ #22095]

View File

@ -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;