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-302-g5670c4a
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 6 Sep 2017 13:23:02 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.26-302-g5670c4a
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 5670c4ab256114e869b1df4b05653aa5f909182c (commit)
from c77eb96925b719001237ca7c9e3cef40d795d66b (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=5670c4ab256114e869b1df4b05653aa5f909182c
commit 5670c4ab256114e869b1df4b05653aa5f909182c
Author: Florian Weimer <fweimer@redhat.com>
Date: Wed Sep 6 15:20:25 2017 +0200
resolv: Fix memory leak with OOM during resolv.conf parsing [BZ #22095]
diff --git a/ChangeLog b/ChangeLog
index d54e13d..298f0fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
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.
+
+2017-09-06 Florian Weimer <fweimer@redhat.com>
+
Remove dead PTR IPv4-to-IPv6 mapping code from nss_dns.
* resolv/nss_dns/dns-host.c (getanswer_r): Remove dead code.
* resolv/tst-res_use_inet6.c (response_ptr_v4, response_ptr_v6):
diff --git a/resolv/res_init.c b/resolv/res_init.c
index fa46ce7..4e1f9fe 100644
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -446,6 +446,11 @@ res_vinit_1 (FILE *fp, struct resolv_conf_parser *parser)
(&parser->nameserver_list);
if (p != NULL)
*p = sa;
+ else
+ {
+ free (sa);
+ return false;
+ }
}
continue;
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
resolv/res_init.c | 5 +++++
2 files changed, 11 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources