@@ -1,5 +1,8 @@
2014-07-08 Siddhesh Poyarekar <siddhesh@redhat.com>
+ * resolv/res_query.c (__libc_res_nsearch): Dereference resplen2
+ after checking that it is non-NULL.
+
* sysdeps/i386/dl-machine.h: Define ELF_MACHINE_NO_REL.
* localedata/tests-mbwc/dat_iswalnum.c [SHOJI_IS_RIGHT]:
@@ -384,7 +384,7 @@ __libc_res_nsearch(res_state statp,
answerp2_malloced);
if (ret > 0 || trailing_dot
/* If the second response is valid then we use that. */
- || (ret == 0 && answerp2 != NULL && resplen2 > 0))
+ || (ret == 0 && resplen2 != NULL && *resplen2 > 0))
return (ret);
saved_herrno = h_errno;
tried_as_is++;
@@ -424,8 +424,8 @@ __libc_res_nsearch(res_state statp,
answer, anslen, answerp,
answerp2, nanswerp2,
resplen2, answerp2_malloced);
- if (ret > 0 || (ret == 0 && answerp2 != NULL
- && resplen2 > 0))
+ if (ret > 0 || (ret == 0 && resplen2 != NULL
+ && *resplen2 > 0))
return (ret);
if (answerp && *answerp != answer) {
@@ -494,7 +494,8 @@ __libc_res_nsearch(res_state statp,
answer, anslen, answerp,
answerp2, nanswerp2, resplen2,
answerp2_malloced);
- if (ret > 0)
+ if (ret > 0 || (ret == 0 && resplen2 != NULL
+ && *resplen2 > 0))
return (ret);
}