[people/ms/ipfire-3.x.git] / glibc / patches / glibc-rh730856.patch

2011-09-01  Andreas Schwab  <schwab@redhat.com>

	* resolv/res_query.c (__libc_res_nquery): Update assertion.

diff -ru a/resolv/res_query.c b/resolv/res_query.c
--- a/resolv/res_query.c	2011-12-12 14:10:52.000000000 -0700
+++ b/resolv/res_query.c	2011-12-12 14:23:04.832739111 -0700
@@ -248,7 +248,7 @@
 	    && *resplen2 > (int) sizeof (HEADER))
 	  {
 	    /* Special case of partial answer.  */
-	    assert (hp != hp2);
+	    assert (n == 0 || hp != hp2);
 	    hp = hp2;
 	  }
 	else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)
Commit	Line	Data
70963a51 MT	1	2011-09-01 Andreas Schwab <schwab@redhat.com>
	2
	3	* resolv/res_query.c (__libc_res_nquery): Update assertion.
	4
	5	diff -ru a/resolv/res_query.c b/resolv/res_query.c
	6	--- a/resolv/res_query.c 2011-12-12 14:10:52.000000000 -0700
	7	+++ b/resolv/res_query.c 2011-12-12 14:23:04.832739111 -0700
	8	@@ -248,7 +248,7 @@
	9	&& *resplen2 > (int) sizeof (HEADER))
	10	{
	11	/* Special case of partial answer. */
	12	- assert (hp != hp2);
	13	+ assert (n == 0 \|\| hp != hp2);
	14	hp = hp2;
	15	}
	16	else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER)