aboutsummaryrefslogtreecommitdiffstats
path: root/irc
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2007-11-05 02:11:54 +0800
committermiwi <miwi@FreeBSD.org>2007-11-05 02:11:54 +0800
commit5682b691dace0041a4258df4e6e0a26bbac3273f (patch)
treec1c2f3554791522154e0424cc27377d7eab2dd78 /irc
parentc59717ee9742f235bba6d1e191b0159cb33a399c (diff)
downloadfreebsd-ports-gnome-5682b691dace0041a4258df4e6e0a26bbac3273f.tar.gz
freebsd-ports-gnome-5682b691dace0041a4258df4e6e0a26bbac3273f.tar.zst
freebsd-ports-gnome-5682b691dace0041a4258df4e6e0a26bbac3273f.zip
- Fix a crash if dirproxy recieves an ACTION command without a parameter.
- Bump PORTREVISION Reviewed by: simon Approved by: portmgr (erwin) Security: http://vuxml.FreeBSD.org/a1ef3fc0-8ad0-11dc-9490-0016179b2dd5.html
Diffstat (limited to 'irc')
-rw-r--r--irc/dircproxy-devel/Makefile1
-rw-r--r--irc/dircproxy-devel/files/patch-src_irc_server.c11
2 files changed, 12 insertions, 0 deletions
diff --git a/irc/dircproxy-devel/Makefile b/irc/dircproxy-devel/Makefile
index a2dbfcaeb561..b1cce5e2280a 100644
--- a/irc/dircproxy-devel/Makefile
+++ b/irc/dircproxy-devel/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dircproxy
PORTVERSION= 1.2.0.b2
+PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= http://dircproxy.securiweb.net/pub/1.2/
DISTNAME= ${PORTNAME}-${PORTVERSION:S/.b/-beta/g}
diff --git a/irc/dircproxy-devel/files/patch-src_irc_server.c b/irc/dircproxy-devel/files/patch-src_irc_server.c
new file mode 100644
index 000000000000..b9454cd0b88a
--- /dev/null
+++ b/irc/dircproxy-devel/files/patch-src_irc_server.c
@@ -0,0 +1,11 @@
+--- src/irc_server.c.orig 2007-11-04 13:13:26.000000000 +0100
++++ src/irc_server.c 2007-11-04 13:13:47.000000000 +0100
+@@ -1155,7 +1155,7 @@
+
+ if (!strcmp(cmsg.cmd, "ACTION")) {
+ irclog_log(p, IRC_LOG_ACTION, logdest, msg.src.orig,
+- "%s", cmsg.paramstarts[0]);
++ "%s", (cmsg.paramstarts != NULL) ? cmsg.paramstarts[0]: "none");
+
+ } else if (!strcmp(cmsg.cmd, "DCC")
+ && p->conn_class->dcc_proxy_incoming) {