This is an automated email from the git hooks/post-receive script. aurel32 pushed a commit to branch sid in repository glibc.
commit c03d43db048d6ac343bde8df7c8223572e2d52d8 Author: Aurelien Jarno <aurel...@aurel32.net> Date: Sun Mar 20 12:52:26 2016 +0100 Update from upstream stable branch. --- debian/changelog | 4 ++-- debian/patches/git-updates.diff | 23 +++++++++++++++++++++-- debian/patches/series | 1 - 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8a7a5da..e1cec93 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ glibc (2.22-4) UNRELEASED; urgency=medium [ Aurelien Jarno ] + * Update from upstream stable branch: + - Fix a memory leak in the resolver. Closes: #818178. * debian/patches/localedata/fr_CA-first_weekday.diff: drop. Closes: #769051. - * debian/patches/any/submitted-resolver-leak.diff: new patch to fix a - memory leak in the resolver. Closes: #818178. [ Samuel Thibault ] * patches/hurd-i386/tg-sendmsg-SCM_RIGHTS.diff,tg-sendmsg-SCM_CREDS.diff: diff --git a/debian/patches/git-updates.diff b/debian/patches/git-updates.diff index bcc4831..6882c1c 100644 --- a/debian/patches/git-updates.diff +++ b/debian/patches/git-updates.diff @@ -1,10 +1,16 @@ GIT update of git://sourceware.org/git/glibc.git/release/2.22/master from glibc-2.22 diff --git a/ChangeLog b/ChangeLog -index cb9124e..b224f46 100644 +index cb9124e..ba4a3f2 100644 --- a/ChangeLog +++ b/ChangeLog -@@ -1,3 +1,379 @@ +@@ -1,3 +1,385 @@ ++2016-03-15 Andreas Schwab <sch...@suse.de> ++ ++ [BZ #19257] ++ * resolv/res_init.c (__res_iclose): Use statp->nscount instead of ++ statp->_u._ext.nscount as loop count. ++ +2016-02-17 Andrew Senkevich <andrew.senkev...@intel.com> + H.J. Lu <hongjiu...@intel.com> + @@ -1890,6 +1896,19 @@ index 357ac04..a0fe9a8 100644 } return status; +diff --git a/resolv/res_init.c b/resolv/res_init.c +index 66561ff..77873c1 100644 +--- a/resolv/res_init.c ++++ b/resolv/res_init.c +@@ -593,7 +593,7 @@ __res_iclose(res_state statp, bool free_addr) { + statp->_vcsock = -1; + statp->_flags &= ~(RES_F_VC | RES_F_CONN); + } +- for (ns = 0; ns < statp->_u._ext.nscount; ns++) ++ for (ns = 0; ns < statp->nscount; ns++) + if (statp->_u._ext.nsaddrs[ns]) { + if (statp->_u._ext.nssocks[ns] != -1) { + close_not_cancel_no_status(statp->_u._ext.nssocks[ns]); diff --git a/resolv/res_query.c b/resolv/res_query.c index 4a9b3b3..95470a9 100644 --- a/resolv/res_query.c diff --git a/debian/patches/series b/debian/patches/series index 731879d..c069d96 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -241,4 +241,3 @@ any/cvs-grantpt-pty-owner.diff any/cvs-bits-libc-stdio-lock.diff any/submitted-hle-checking-mutex.diff any/submitted-dlopen-noload.diff -any/submitted-resolver-leak.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git