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)
(cherry picked from commit e5d560e0e7f621b5cde4bcbbac424f8b2742395a)

diff --git a/resolv/res_init.c b/resolv/res_init.c
index 66561ffac2ffc039707676ed8b4bf36ee50ee889..77873c1b94a3bc60f5ba80a3ceb9e93d4f3d0d3a 100644 (file)
--- 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]);