diff options
| author | Ludwig Nussel <ludwig.nussel@suse.de> | 2010-05-19 15:43:44 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-06-25 02:36:10 +0200 |
| commit | 2b2844b10d7b7e5c97f9c667d664d9418bb7769a (patch) | |
| tree | 57a7bdc077bcb09753e20c45e40785e0bc742655 /avahi-core | |
| parent | bdec379e33d153413d7559f393ef7f9d35a1e3bb (diff) | |
socket: 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.
Diffstat (limited to 'avahi-core')
| -rw-r--r-- | 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..f9b90a2 100644 --- a/avahi-core/socket.c +++ b/avahi-core/socket.c @@ -652,6 +652,10 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv4( goto fail; } + /* For corrupt packets FIONREAD returns zero size (See rhbz #607297) */ + 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; } + /* For corrupt packets FIONREAD returns zero size (See rhbz #607297) */ + if (!ms) + goto fail; + p = avahi_dns_packet_new(ms + AVAHI_DNS_PACKET_EXTRA_SIZE); io.iov_base = AVAHI_DNS_PACKET_DATA(p); |