From 660675dec1300ccac9ea7038c17f61711e9b94ce Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Fri, 24 Oct 2008 08:20:04 +0000 Subject: Fix tests for existence of second reply. --- ChangeLog | 1 + resolv/res_query.c | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad37c3b17f..92b19ff6c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2008-10-24 Ulrich Drepper * resolv/res_query.c (__libc_res_nquery): Add a few casts. + Fix tests for existence of second reply. 2008-10-23 Ulrich Drepper diff --git a/resolv/res_query.c b/resolv/res_query.c index b6c70f0462..6ac33ce64c 100644 --- a/resolv/res_query.c +++ b/resolv/res_query.c @@ -244,14 +244,14 @@ __libc_res_nquery(res_state statp, tests of HP2. */ HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp; - if (n < (int) sizeof (HEADER) && nanswerp2 != NULL - && *nanswerp2 > (int) sizeof (HEADER)) + if (n < (int) sizeof (HEADER) && answerp2 != NULL + && *resplen2 > (int) sizeof (HEADER)) { /* Special case of partial answer. */ assert (hp != hp2); hp = hp2; } - else if (nanswerp2 != NULL && *nanswerp2 < (int) sizeof (HEADER) + else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) && n > (int) sizeof (HEADER)) { /* Special case of partial answer. */ -- cgit 1.4.1