summaryrefslogtreecommitdiffstats
path: root/irc
diff options
context:
space:
mode:
authormiwi <miwi@FreeBSD.org>2007-11-05 12:11:57 +0000
committermiwi <miwi@FreeBSD.org>2007-11-05 12:11:57 +0000
commit52a5e12d42ba551b9720c0c217a2ab8b4a65c866 (patch)
tree9b0a925b883f4c0fcbe72d19c036c40865eaa185 /irc
parentb40a041175529427ea666a07ce662a57d0230f23 (diff)
downloadFreeBSD-ports-52a5e12d42ba551b9720c0c217a2ab8b4a65c866.zip
FreeBSD-ports-52a5e12d42ba551b9720c0c217a2ab8b4a65c866.tar.gz
- Fix a crash if dirproxy recieves an ACTION command without a parameter.
- Bump PORTREVISION Approved by: portmgr (erwin) Security: http://www.vuxml.org/freebsd/a1ef3fc0-8ad0-11dc-9490-0016179b2dd5.html
Diffstat (limited to 'irc')
-rw-r--r--irc/dircproxy/Makefile1
-rw-r--r--irc/dircproxy/files/patch-src_irc_server.c13
2 files changed, 12 insertions, 2 deletions
diff --git a/irc/dircproxy/Makefile b/irc/dircproxy/Makefile
index 284727a..b6f4c08 100644
--- a/irc/dircproxy/Makefile
+++ b/irc/dircproxy/Makefile
@@ -7,6 +7,7 @@
PORTNAME= dircproxy
PORTVERSION= 1.0.5
+PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= http://www.securiweb.net/pub/oss/dircproxy/1.0/ \
ftp://ftp.netsplit.com/pub/dircproxy/stable/
diff --git a/irc/dircproxy/files/patch-src_irc_server.c b/irc/dircproxy/files/patch-src_irc_server.c
index 67b0024..69bf380 100644
--- a/irc/dircproxy/files/patch-src_irc_server.c
+++ b/irc/dircproxy/files/patch-src_irc_server.c
@@ -1,5 +1,5 @@
---- src/irc_server.c.orig 2007-10-02 13:27:29.000000000 +0200
-+++ src/irc_server.c 2007-10-02 13:28:07.000000000 +0200
+--- src/irc_server.c.orig 2002-01-31 15:56:37.000000000 +0100
++++ src/irc_server.c 2007-11-05 12:35:57.000000000 +0100
@@ -700,7 +700,7 @@
free(s);
@@ -18,3 +18,12 @@
squelch = 1;
break;
} else {
+@@ -1076,7 +1076,7 @@
+
+ if (!strcmp(cmsg.cmd, "ACTION")) {
+ if (p->conn_class->log_events & IRC_LOG_ACTION)
+- irclog_ctcp(p, msg.params[0], msg.src.orig, "%s", cmsg.orig);
++ irclog_ctcp(p, (msg.params != NULL ) ? msg.params[0]: "none", msg.src.orig, "%s", cmsg.orig);
+
+ } else if (!strcmp(cmsg.cmd, "DCC")
+ && p->conn_class->dcc_proxy_incoming) {
OpenPOWER on IntegriCloud