From 5908f779e76e24827c0c6f38f2b7a0f857333bcb Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 19 May 2008 17:34:14 +0000 Subject: * resolv/res_query.c (__libc_res_nquery): In case one of two answer was too short don't try to read that answer's header. * resolv/res_send.c (send_dg): In case of timeout and there are two queries and one has been answered, return value indicating success. --- resolv/res_query.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'resolv/res_query.c') diff --git a/resolv/res_query.c b/resolv/res_query.c index a8e8d7b..3d2f2fe 100644 --- a/resolv/res_query.c +++ b/resolv/res_query.c @@ -224,6 +224,21 @@ __libc_res_nquery(res_state statp, tests of HP2. */ HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp; + if (n < sizeof (HEADER) && nanswerp2 != NULL + && *nanswerp2 > sizeof (HEADER)) + { + /* Special case of partial answer. */ + assert (hp != hp2); + hp = hp2; + } + else if (nanswerp2 != NULL + && *nanswerp2 < sizeof (HEADER) && n > sizeof (HEADER)) + { + /* Special case of partial answer. */ + assert (hp != hp2); + hp2 = hp; + } + if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0) && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) { #ifdef DEBUG -- cgit v1.1