From 57912a71cc379f8582e3ea272782dc39c6c02e45 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 15 Jun 2011 22:43:58 -0400 Subject: [PATCH] Fix typo in recent resolver change which causes segvs --- ChangeLog | 5 +++++ resolv/res_send.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 01c0ac7..368c52a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-06-15 Ulrich Drepper + + * resolv/res_send.c (__libc_res_nsend): Fix typos in last patch. We + need to dereference resplen2. + 2011-06-14 Andreas Schwab * sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c: New file. diff --git a/resolv/res_send.c b/resolv/res_send.c index 97142b7..a001c1e 100644 --- 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 -- 2.7.4