From: Florian Weimer Date: Mon, 11 Apr 2016 08:55:43 +0000 (+0200) Subject: nss_dns: Fix assertion failure in _nss_dns_getcanonname_r [BZ #19865] X-Git-Tag: glibc-2.24~404 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d29fb41f4431ca35ea360498ef9d37558ce90d76;p=thirdparty%2Fglibc.git nss_dns: Fix assertion failure in _nss_dns_getcanonname_r [BZ #19865] --- diff --git a/ChangeLog b/ChangeLog index 984117de7f9..c8df2c239b7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-04-11 Florian Weimer + + [BZ #19865] + * resolv/nss_dns/dns-canon.c (_nss_dns_getcanonname_r): Restore + original buffer before retry. + 2016-04-10 Samuel Thibault * 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 27255fda58c..fd73f19984c 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: