From e5d560e0e7f621b5cde4bcbbac424f8b2742395a Mon Sep 17 00:00:00 2001 From: Andreas Schwab <schwab@suse.de> Date: Wed, 18 Nov 2015 15:45:59 +0100 Subject: [PATCH 48/65] Fix resource leak in resolver (bug 19257) The number of currently defined nameservers is stored in ->nscount, whereas ->_u._ext.nscount is set by __libc_res_nsend only after local initializations. (cherry picked from commit 5e7fdabd7df1fc6c56d104e61390bf5a6b526c38) --- ChangeLog | 6 ++++++ resolv/res_init.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index b224f46..ba4a3f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-03-15 Andreas Schwab <schwab@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.senkevich@intel.com> H.J. Lu <hongjiu.lu@intel.com> 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]); -- 2.7.4