diff options
| author |   Jeff Horelick <jdhore@gentoo.org> | 2012-10-20 15:20:01 +0000 |
|---|---|---|
| committer | Jeff Horelick <jdhore@gentoo.org> | 2012-10-20 15:20:01 +0000 |
| commit | 35e385460db4381d0a5be66f7649eaa300ed7be8 (patch) | |
| tree | 701ce850bdcbd896e7d0b9145bb04c8afb35f01e /net-irc/charybdis/files | |
| parent | Mark ~amd64-linux (diff) | |
| download | gentoo-2-35e385460db4381d0a5be66f7649eaa300ed7be8.tar.gz gentoo-2-35e385460db4381d0a5be66f7649eaa300ed7be8.tar.bz2 gentoo-2-35e385460db4381d0a5be66f7649eaa300ed7be8.zip | |
Version bump
(Portage version: 2.2.0_alpha141/cvs/Linux i686, signed Manifest commit with key 23E9E900)
Diffstat (limited to 'net-irc/charybdis/files')
| -rw-r--r-- | net-irc/charybdis/files/charybdis-3.4.0-testline-crash-fix.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/net-irc/charybdis/files/charybdis-3.4.0-testline-crash-fix.patch b/net-irc/charybdis/files/charybdis-3.4.0-testline-crash-fix.patch new file mode 100644 index 000000000000..0e72f7d21393 --- /dev/null +++ b/net-irc/charybdis/files/charybdis-3.4.0-testline-crash-fix.patch @@ -0,0 +1,20 @@ +commit 047a9b1ab072b8103ec954adc2f75baf2e9be553 +Author: Jilles Tjoelker <jilles@stack.nl> +Date: Thu Oct 18 15:54:24 2012 +0200 + + Fix a crash with testline, introduced with the "underlying ipv4" feature. + (cherry picked from commit 6387b5ad4472d1a8f8fbd0b7f3f32dd9d8542072) + +diff --git a/src/hostmask.c b/src/hostmask.c +index 99899af..fb28bbb 100644 +--- a/src/hostmask.c ++++ b/src/hostmask.c +@@ -422,7 +422,7 @@ find_address_conf(const char *host, const char *sockhost, const char *user, + } + + #ifdef RB_IPV6 +- if(ip->sa_family == AF_INET6 && ++ if(ip != NULL && ip->sa_family == AF_INET6 && + ipv4_from_ipv6((const struct sockaddr_in6 *)(const void *)ip, &ip4)) + { + kconf = find_conf_by_address(NULL, NULL, NULL, (struct sockaddr *)&ip4, CONF_KILL, AF_INET, vuser, NULL); |