79ac3dcad4
Copy from home:lnussel:branches:GNOME:Factory/avahi via accept of submit request 41956 revision 2. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/41956 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/avahi?expand=0&rev=38
42 lines
1.2 KiB
Diff
42 lines
1.2 KiB
Diff
From cef39a95d31834ab3aac2ea09970ad54d5f5a08b Mon Sep 17 00:00:00 2001
|
|
From: Ludwig Nussel <ludwig.nussel@suse.de>
|
|
Date: Wed, 19 May 2010 15:43:44 +0200
|
|
Subject: [PATCH] ignore packet if FIONREAD returns zero
|
|
|
|
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(-)
|
|
|
|
diff --git a/avahi-core/socket.c b/avahi-core/socket.c
|
|
index 4146d5a..49238c2 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(
|
|
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);
|
|
--
|
|
1.7.1
|
|
|