GNU C Library master sources branch release/2.23/master updated. glibc-2.23-38-g49203a5

[fw@sourceware.org]

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, release/2.23/master has been updated
       via  49203a513f86e5238d43da23505a600bef1a5d7a (commit)
      from  888d9a0146b4b8364e065ab359eae5b3db5badb9 (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=49203a513f86e5238d43da23505a600bef1a5d7a

commit 49203a513f86e5238d43da23505a600bef1a5d7a
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]
    
    (cherry picked from commit d29fb41f4431ca35ea360498ef9d37558ce90d76)

diff --git a/ChangeLog b/ChangeLog
index 85a0733..7f4794f 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-14  Florian Weimer  <fweimer@redhat.com>
 
 	* malloc/arena.c (__malloc_fork_lock_parent)
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