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.23-174-gd29fb41
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 11 Apr 2016 09:01:54 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.23-174-gd29fb41
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 d29fb41f4431ca35ea360498ef9d37558ce90d76 (commit)
from eb68636fed3603fcb148ac9e6f57193a806a1d27 (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=d29fb41f4431ca35ea360498ef9d37558ce90d76
commit d29fb41f4431ca35ea360498ef9d37558ce90d76
Author: Florian Weimer <fweimer@redhat.com>
Date: Mon Apr 11 10:55:43 2016 +0200
nss_dns: Fix assertion failure in _nss_dns_getcanonname_r [BZ #19865]
diff --git a/ChangeLog b/ChangeLog
index 984117d..c8df2c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-04-11 Florian Weimer <fweimer@redhat.com>
+
+ [BZ #19865]
+ * resolv/nss_dns/dns-canon.c (_nss_dns_getcanonname_r): Restore
+ original buffer before retry.
+
2016-04-10 Samuel Thibault <samuel.thibault@ens-lyon.org>
* sysdeps/generic/ldsodefs.h (struct rtld_global_ro)
diff --git a/resolv/nss_dns/dns-canon.c b/resolv/nss_dns/dns-canon.c
index 27255fd..fd73f19 100644
--- a/resolv/nss_dns/dns-canon.c
+++ b/resolv/nss_dns/dns-canon.c
@@ -144,6 +144,13 @@ _nss_dns_getcanonname_r (const char *name, char *buffer, size_t buflen,
ptr += sizeof (uint16_t) + __ns_get16 (ptr);
}
}
+
+ /* Restore original buffer before retry. */
+ if (ansp.ptr != buf)
+ {
+ free (ansp.ptr);
+ ansp.ptr = buf;
+ }
}
out:
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
resolv/nss_dns/dns-canon.c | 7 +++++++
2 files changed, 13 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources