Fix typo in recent resolver change which causes segvs

This commit is contained in:
Ulrich Drepper 2011-06-15 22:43:58 -04:00
parent ee22793dd0
commit 57912a71cc
2 changed files with 7 additions and 2 deletions

View File

@ -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> 2011-06-14 Andreas Schwab <schwab@redhat.com>
* sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c: New file. * sysdeps/unix/sysv/linux/wordsize-64/dl-fxstatat64.c: New file.

View File

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