diff options
| author | Andreas Schwab <schwab@suse.de> | 2015-11-18 15:45:59 +0100 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2016-03-20 12:23:26 +0100 |
| commit | 317da342ba4417c30d985f5593d78bb1364a62c3 (patch) | |
| tree | c8d3ebc836123a39cb2a46021eae7d8ccb8226db | |
| parent | 33ab2ad58eba55de05a05f4adb795e1c172024bb (diff) | |
| download | glibc-317da342ba4417c30d985f5593d78bb1364a62c3.tar.gz glibc-317da342ba4417c30d985f5593d78bb1364a62c3.tar.xz glibc-317da342ba4417c30d985f5593d78bb1364a62c3.zip | |
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)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | resolv/res_init.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 4abbd3b5dc..8f5b28f944 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-03-11 H.J. Lu <hongjiu.lu@intel.com> [BZ #19758] diff --git a/resolv/res_init.c b/resolv/res_init.c index e0b6a80dc7..6c951f526e 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -594,7 +594,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]); |