svn commit: r404119 - in head/irc/quassel: . files

[Mark Felder]

Author: feld
Date: Mon Dec 21 15:41:30 2015
New Revision: 404119
URL: https://svnweb.freebsd.org/changeset/ports/404119

Log:
  irc/quassel: Import patch to resolve DoS CVE
  
  Approved by:	ports-secteam (with hat)
  MFH:		2015Q4
  Security:	CVE-2015-8547

Added:
  head/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp   (contents, props changed)
Modified:
  head/irc/quassel/Makefile

Modified: head/irc/quassel/Makefile
==============================================================================
--- head/irc/quassel/Makefile	Mon Dec 21 15:39:40 2015	(r404118)
+++ head/irc/quassel/Makefile	Mon Dec 21 15:41:30 2015	(r404119)
@@ -3,6 +3,7 @@
 
 PORTNAME=	quassel
 PORTVERSION=	0.12.2
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	http://www.quassel-irc.org/pub/
 

Added: head/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/irc/quassel/files/patch-src_core_coreuserinputhandler.cpp	Mon Dec 21 15:41:30 2015	(r404119)
@@ -0,0 +1,12 @@
+Fix CVE-2015-8547
+--- src/core/coreuserinputhandler.cpp.orig	2015-04-23 20:47:17 UTC
++++ src/core/coreuserinputhandler.cpp
+@@ -228,7 +228,7 @@ void CoreUserInputHandler::doMode(const 
+     if (!isNumber || maxModes == 0) maxModes = 1;
+ 
+     QStringList nickList;
+-    if (nicks == "*") { // All users in channel
++    if (nicks == "*" && bufferInfo.type() == BufferInfo::ChannelBuffer) { // All users in channel
+         const QList<IrcUser*> users = network()->ircChannel(bufferInfo.bufferName())->ircUsers();
+         foreach(IrcUser *user, users) {
+             if ((addOrRemove == '+' && !network()->ircChannel(bufferInfo.bufferName())->userModes(user).contains(mode))