pool/avahi
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 41956 from home:lnussel:branches:GNOME:Factory

Browse Source 
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
This commit is contained in:
Vincent Untz 2010-06-23 11:04:32 +00:00 committed by Git OBS Bridge
parent 589e6b3a6d
commit 79ac3dcad4
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
avahi-0.6.25-fixcrash.patch
View File

@ -1,4 +1,4 @@
From ae19b3039335999e3c06f2bec9ae11ee79b204c1 Mon Sep 17 00:00:00 2001 From cef39a95d31834ab3aac2ea09970ad54d5f5a08b Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de> From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Wed, 19 May 2010 15:43:44 +0200 Date: Wed, 19 May 2010 15:43:44 +0200
Subject: [PATCH] ignore packet if FIONREAD returns zero Subject: [PATCH] ignore packet if FIONREAD returns zero
@ -7,14 +7,25 @@ zero size is reported for corrupt packets. recvmsg() later could
nevertheless get data from a good packet that followed the bad one. nevertheless get data from a good packet that followed the bad one.
So get out early to avoid hitting an assertion. So get out early to avoid hitting an assertion.
--- ---
avahi-core/socket.c | 4 ++++ avahi-core/socket.c | 8 ++++++++
1 files changed, 4 insertions(+), 0 deletions(-) 1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/avahi-core/socket.c b/avahi-core/socket.c diff --git a/avahi-core/socket.c b/avahi-core/socket.c
index 4146d5a..8b9736a 100644 index 4146d5a..49238c2 100644
--- a/avahi-core/socket.c --- a/avahi-core/socket.c
+++ b/avahi-core/socket.c +++ b/avahi-core/socket.c
@@ -805,6 +805,10 @@ AvahiDnsPacket *avahi_recv_dns_packet_ipv6( @@ -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; goto fail;
} }
@ -26,5 +37,5 @@ index 4146d5a..8b9736a 100644
io.iov_base = AVAHI_DNS_PACKET_DATA(p); io.iov_base = AVAHI_DNS_PACKET_DATA(p);
-- --
1.6.4.2 1.7.1

5
avahi.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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 Wed Jun 16 11:19:57 UTC 2010 - lnussel@suse.de