diff --git a/avahi-0.6.25-fixcrash.patch b/avahi-0.6.25-fixcrash.patch index 4e04ec8..c879e13 100644 --- a/avahi-0.6.25-fixcrash.patch +++ b/avahi-0.6.25-fixcrash.patch @@ -1,4 +1,4 @@ -From cef39a95d31834ab3aac2ea09970ad54d5f5a08b Mon Sep 17 00:00:00 2001 +From ae19b3039335999e3c06f2bec9ae11ee79b204c1 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Wed, 19 May 2010 15:43:44 +0200 Subject: [PATCH] ignore packet if FIONREAD returns zero @@ -7,25 +7,14 @@ zero size is reported for corrupt packets. recvmsg() later could nevertheless get data from a good packet that followed the bad one. So get out early to avoid hitting an assertion. --- - avahi-core/socket.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + avahi-core/socket.c | 4 ++++ + 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/avahi-core/socket.c b/avahi-core/socket.c -index 4146d5a..49238c2 100644 +index 4146d5a..8b9736a 100644 --- a/avahi-core/socket.c +++ b/avahi-core/socket.c -@@ -652,6 +652,10 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv4( - goto fail; - } - -+ /* corrupt packets have zero size */ -+ if (!ms) -+ goto fail; -+ - p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE); - - io.iov_base = AVAHI_DNS_PACKET_DATA(p); -@@ -805,6 +809,10 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv6( +@@ -805,6 +805,10 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv6( goto fail; } @@ -37,5 +26,5 @@ index 4146d5a..49238c2 100644 io.iov_base = AVAHI_DNS_PACKET_DATA(p); -- -1.7.1 +1.6.4.2 diff --git a/avahi.changes b/avahi.changes index e78d6b6..ba3347c 100644 --- a/avahi.changes +++ b/avahi.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Mon Jun 21 12:04:15 UTC 2010 - lnussel@suse.de - -- also check ipv6 case in avahi-0.6.25-fixcrash.patch - ------------------------------------------------------------------- Wed Jun 16 11:19:57 UTC 2010 - lnussel@suse.de