This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.26-303-ga830473
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 6 Sep 2017 13:37:08 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.26-303-ga830473
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via a83047308196e3e54716a39dd85c0a08b198d6bd (commit)
from 5670c4ab256114e869b1df4b05653aa5f909182c (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a83047308196e3e54716a39dd85c0a08b198d6bd
commit a83047308196e3e54716a39dd85c0a08b198d6bd
Author: Florian Weimer <fweimer@redhat.com>
Date: Wed Sep 6 15:32:43 2017 +0200
resolv: __resolv_conf_attach must not free passed conf object [BZ #22096]
diff --git a/ChangeLog b/ChangeLog
index 298f0fd..6150ba1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
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]
* resolv/res_init.c (res_vinit_1): Avoid memory leak in case of
dynarray allocation failure.
diff --git a/resolv/resolv_conf.c b/resolv/resolv_conf.c
index f391d30..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;
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
resolv/resolv_conf.c | 5 +----
2 files changed, 7 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources