lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
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> 2017-09-06 Florian Weimer <fweimer@redhat.com>
[BZ #22095] [BZ #22095]

3
resolv/resolv_conf.c
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 (); struct resolv_conf_global *global_copy = get_locked_global ();
if (global_copy == NULL) if (global_copy == NULL)
{
free (conf);
return false; return false;
}
/* Try to find an unused index in the array. */ /* Try to find an unused index in the array. */
size_t index; size_t index;