diff options
| author | Martin Wilke <miwi@FreeBSD.org> | 2007-11-05 12:11:57 +0000 |
|---|---|---|
| committer | Martin Wilke <miwi@FreeBSD.org> | 2007-11-05 12:11:57 +0000 |
| commit | d0e7cdc528376c0639b87b537cd20fd3561b74b0 (patch) | |
| tree | ceaa643e605196a041da18093eaf0daf7ae3aec1 /irc | |
| parent | 5d5ca9e2bba731f5321a0f66174c4173aa8ccdf7 (diff) | |
| download | ports-d0e7cdc528376c0639b87b537cd20fd3561b74b0.tar.gz ports-d0e7cdc528376c0639b87b537cd20fd3561b74b0.zip | |
- 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
Notes
Notes:
svn path=/head/; revision=202521
Diffstat (limited to 'irc')
| -rw-r--r-- | irc/dircproxy/Makefile | 1 | ||||
| -rw-r--r-- | irc/dircproxy/files/patch-src_irc_server.c | 13 |
2 files changed, 12 insertions, 2 deletions
diff --git a/irc/dircproxy/Makefile b/irc/dircproxy/Makefile index 284727ae6c88..b6f4c08f076e 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 67b0024ed413..69bf380ef73c 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) { |