|
|
817ee79 |
diff -rup a/resolv/res_query.c b/resolv/res_query.c
|
|
|
817ee79 |
--- a/resolv/res_query.c 2012-02-16 22:51:17.451796009 -0700
|
|
|
817ee79 |
+++ b/resolv/res_query.c 2012-02-16 22:54:42.522623598 -0700
|
|
|
817ee79 |
@@ -122,6 +122,7 @@ __libc_res_nquery(res_state statp,
|
|
|
817ee79 |
int *resplen2)
|
|
|
817ee79 |
{
|
|
|
817ee79 |
HEADER *hp = (HEADER *) answer;
|
|
|
817ee79 |
+ HEADER *hp2;
|
|
|
817ee79 |
int n, use_malloc = 0;
|
|
|
817ee79 |
u_int oflags = statp->_flags;
|
|
|
817ee79 |
|
|
|
817ee79 |
@@ -239,26 +240,25 @@ __libc_res_nquery(res_state statp,
|
|
|
817ee79 |
/* __libc_res_nsend might have reallocated the buffer. */
|
|
|
817ee79 |
hp = (HEADER *) *answerp;
|
|
|
817ee79 |
|
|
|
817ee79 |
- /* We simplify the following tests by assigning HP to HP2. It
|
|
|
817ee79 |
- is easy to verify that this is the same as ignoring all
|
|
|
817ee79 |
- tests of HP2. */
|
|
|
817ee79 |
- HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp;
|
|
|
817ee79 |
-
|
|
|
817ee79 |
- if (n < (int) sizeof (HEADER) && answerp2 != NULL
|
|
|
817ee79 |
- && *resplen2 > (int) sizeof (HEADER))
|
|
|
817ee79 |
+ /* We simplify the following tests by assigning HP to HP2 or
|
|
|
817ee79 |
+ vice versa. It is easy to verify that this is the same as
|
|
|
817ee79 |
+ ignoring all tests of HP or HP2. */
|
|
|
817ee79 |
+ if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER))
|
|
|
25912ea |
{
|
|
|
817ee79 |
- /* Special case of partial answer. */
|
|
|
0e9bf8b |
- assert (hp != hp2);
|
|
|
817ee79 |
- hp = hp2;
|
|
|
817ee79 |
+ hp2 = hp;
|
|
|
817ee79 |
}
|
|
|
817ee79 |
- else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
|
|
|
817ee79 |
- && n > (int) sizeof (HEADER))
|
|
|
817ee79 |
+ else
|
|
|
817ee79 |
{
|
|
|
817ee79 |
- /* Special case of partial answer. */
|
|
|
25912ea |
- assert (hp != hp2);
|
|
|
817ee79 |
- hp2 = hp;
|
|
|
817ee79 |
+ hp2 = (HEADER *) *answerp2;
|
|
|
817ee79 |
+ if (n < (int) sizeof (HEADER))
|
|
|
817ee79 |
+ {
|
|
|
817ee79 |
+ hp = hp2;
|
|
|
817ee79 |
+ }
|
|
|
25912ea |
}
|
|
|
817ee79 |
|
|
|
817ee79 |
+ /* Make sure both hp and hp2 are defined */
|
|
|
817ee79 |
+ assert((hp != NULL) && (hp2 != NULL));
|
|
|
817ee79 |
+
|
|
|
817ee79 |
if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0)
|
|
|
817ee79 |
&& (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) {
|
|
|
817ee79 |
#ifdef DEBUG
|