summaryrefslogtreecommitdiff
path: root/testing/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2011-09-09 23:14:45 +0000
committerroot <root@rshg054.dnsready.net>2011-09-09 23:14:45 +0000
commit42db4a0cf3a829fcd1bc2150669c6aa3c2984815 (patch)
tree91bdb63fa6802146ab19b3fbf8f6fc5ab78e23c2 /testing/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
parenta7b0a0b362d0535cd86b575a45ec70cc2332fa62 (diff)
Fri Sep 9 23:14:45 UTC 2011
Diffstat (limited to 'testing/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch')
-rw-r--r--testing/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/testing/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch b/testing/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
new file mode 100644
index 000000000..ef91116e5
--- /dev/null
+++ b/testing/glibc/glibc-2.14-avoid-assertion-on-empty-dns-answer.patch
@@ -0,0 +1,26 @@
+From 032c0ee3ee28841d684950e33a77210118697566 Mon Sep 17 00:00:00 2001
+From: Andreas Schwab <schwab@redhat.com>
+Date: Thu, 1 Sep 2011 10:46:14 +0200
+Subject: [PATCH] Avoid assertion failure when first DNS answer was empty
+
+---
+ ChangeLog | 4 ++++
+ resolv/res_query.c | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/resolv/res_query.c b/resolv/res_query.c
+index 2f7cfaa..2ded9fb 100644
+--- a/resolv/res_query.c
++++ b/resolv/res_query.c
+@@ -248,7 +248,7 @@ __libc_res_nquery(res_state statp,
+ && *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)
+--
+1.7.3.4
+