[Pkg-utopia-commits] r2685 - /packages/etch/avahi/debian/patches/15_CVE-2007-3372.patch

[sjoerd at users.alioth.debian.org]

Author: sjoerd
Date: Sat Dec 20 13:06:31 2008
New Revision: 2685

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2685
Log:
Remove hunks unneeded for this version

Modified:
    packages/etch/avahi/debian/patches/15_CVE-2007-3372.patch

Modified: packages/etch/avahi/debian/patches/15_CVE-2007-3372.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/etch/avahi/debian/patches/15_CVE-2007-3372.patch?rev=2685&op=diff
==============================================================================
--- packages/etch/avahi/debian/patches/15_CVE-2007-3372.patch (original)
+++ packages/etch/avahi/debian/patches/15_CVE-2007-3372.patch Sat Dec 20 13:06:31 2008
@@ -1,12 +1,3 @@
-commit b5daab9d464d239b0bf24379c6472ba09af35f66
-Author: Lennart Poettering <lennart at poettering.net>
-Date:   Mon May 21 17:13:05 2007 +0000
-
-    fix a local DoS (by hitting an assert) when passing empty TXT strings to the avahi-daemon for regsitration. (Problem identified and original patch supplied by Emanuele Aina)
-    
-    
-    git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1482 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
-
 diff --git a/avahi-common/strlst.c b/avahi-common/strlst.c
 index c6ceb0f..9ffa18e 100644
 --- a/avahi-common/strlst.c
@@ -20,17 +11,3 @@
  
      if (!(n = avahi_string_list_add_anonymous(l, size)))
          return NULL;
-diff --git a/avahi-daemon/dbus-util.c b/avahi-daemon/dbus-util.c
-index d1a7a20..ca08d7b 100644
---- a/avahi-daemon/dbus-util.c
-+++ b/avahi-daemon/dbus-util.c
-@@ -344,6 +344,9 @@ int avahi_dbus_read_strlst(DBusMessage *m, int idx, AvahiStringList **l) {
-         k = (const uint8_t*) "";
-         n = 0;
-         dbus_message_iter_get_fixed_array(&sub2, &k, &n);
-+
-+        if (!k)
-+            k = (const uint8_t*) "";
-             
-         strlst = avahi_string_list_add_arbitrary(strlst, k, n);
-