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.

diff --git a/ChangeLog b/ChangeLog
index 3b6ee8238637ce8c76cbcc1de672006fccf84cdb..a38c643f41d15e8e02d768bc83ebe2b9dd06e4cf 100644 (file)
--- 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-14  Andreas Schwab  <schwab@linux-m68k.org>
 
        * math/test-signgam-finite-c99.c: Also #undef

diff --git a/resolv/res_init.c b/resolv/res_init.c
index 128004afb8977dafaf497ddd15564b9421b54434..02590fb1fdbb15c9ff20295d7a96d2d426752e04 100644 (file)
--- a/resolv/res_init.c
+++ b/resolv/res_init.c
@@ -580,7 +580,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]);