Fix typo in recent resolver change which causes segvs

diff --git a/ChangeLog b/ChangeLog
index 01c0ac787226b563ae60d3ee09b413c15022af69..368c52a7a7adbd2e4933007b012fd364237fabfa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-15  Ulrich Drepper  <drepper@gmail.com>
+
+       * resolv/res_send.c (__libc_res_nsend): Fix typos in last patch.  We
+       need to dereference resplen2.
+
 2011-06-14  Andreas Schwab  <schwab@redhat.com>
 
        * sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c: New file.

diff --git a/resolv/res_send.c b/resolv/res_send.c
index 97142b7dd05c231b62ac779e954d95f94f573504..a001c1e753a561781304c5d67e05fda2115f2fac 100644 (file)
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
                                    ns, ansp, ansp2, nansp2, resplen2);
                        if (n < 0)
                                return (-1);
-                       if (n == 0 && (buf2 == NULL || resplen2 == 0))
+                       if (n == 0 && (buf2 == NULL || *resplen2 == 0))
                                goto next_ns;
                } else {
                        /* Use datagrams. */
@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
                                    ansp2, nansp2, resplen2);
                        if (n < 0)
                                return (-1);
-                       if (n == 0 && (buf2 == NULL || resplen2 == 0))
+                       if (n == 0 && (buf2 == NULL || *resplen2 == 0))
                                goto next_ns;
                        if (v_circuit)
                          // XXX Check whether both requests failed or