about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-06-15 22:43:58 -0400
committerUlrich Drepper <drepper@gmail.com>2011-06-15 22:43:58 -0400
commit57912a71cc379f8582e3ea272782dc39c6c02e45 (patch)
tree31e48707a0112a03bf0a9099d562fdbc49c79e04
parentee22793dd0b6c6bcbf341b5324da1af83d07dd13 (diff)
downloadglibc-57912a71cc379f8582e3ea272782dc39c6c02e45.tar.gz
glibc-57912a71cc379f8582e3ea272782dc39c6c02e45.tar.xz
glibc-57912a71cc379f8582e3ea272782dc39c6c02e45.zip
Fix typo in recent resolver change which causes segvs
-rw-r--r--ChangeLog5
-rw-r--r--resolv/res_send.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 01c0ac7872..368c52a7a7 100644
--- 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 97142b7dd0..a001c1e753 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