Security: Fix CVE-2006-6811

This commit is contained in:
Michael Nottebrock 2007-01-10 00:35:49 +00:00
parent 602ada9858
commit 34da1e4df7
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=181937
4 changed files with 54 additions and 0 deletions

View File

@ -8,6 +8,7 @@
PORTNAME= kdenetwork
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES?= net kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src

View File

@ -0,0 +1,26 @@
------------------------------------------------------------------------
r621124 | mueller | 2007-01-08 11:33:10 +0100 (Mon, 08 Jan 2007) | 2 lines
add fix for CVE-2006-6811
------------------------------------------------------------------------
Index: ksirc/iocontroller.cpp
===================================================================
--- ksirc/iocontroller.cpp (revision 621123)
+++ ksirc/iocontroller.cpp (revision 621124)
@@ -266,13 +266,13 @@ void KSircIOController::stdout_read(KPro
if(ksopts->autoCreateWin == TRUE && line[0] != '`' && line[1] != '#' && line[1] != '&' && noticeCreate) {
//kdDebug(5008) << "Creating window for: " << qsname << " because of: " << line.data() << endl;
ksircproc->new_toplevel(KSircChannel(ksircproc->serverName(), qsname));
- assert(ksircproc->TopList[qsname] != 0x0);
}
- else{
+ if (!ksircproc->TopList[qsname]) {
qsname = "!default";
if(line[0] == '`')
qsname = "!discard";
}
+ assert(ksircproc->TopList[qsname]);
}
ksircproc->TopList[qsname]->sirc_receive(line);

View File

@ -8,6 +8,7 @@
PORTNAME= kdenetwork
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 1
CATEGORIES?= net kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src

View File

@ -0,0 +1,26 @@
------------------------------------------------------------------------
r621124 | mueller | 2007-01-08 11:33:10 +0100 (Mon, 08 Jan 2007) | 2 lines
add fix for CVE-2006-6811
------------------------------------------------------------------------
Index: ksirc/iocontroller.cpp
===================================================================
--- ksirc/iocontroller.cpp (revision 621123)
+++ ksirc/iocontroller.cpp (revision 621124)
@@ -266,13 +266,13 @@ void KSircIOController::stdout_read(KPro
if(ksopts->autoCreateWin == TRUE && line[0] != '`' && line[1] != '#' && line[1] != '&' && noticeCreate) {
//kdDebug(5008) << "Creating window for: " << qsname << " because of: " << line.data() << endl;
ksircproc->new_toplevel(KSircChannel(ksircproc->serverName(), qsname));
- assert(ksircproc->TopList[qsname] != 0x0);
}
- else{
+ if (!ksircproc->TopList[qsname]) {
qsname = "!default";
if(line[0] == '`')
qsname = "!discard";
}
+ assert(ksircproc->TopList[qsname]);
}
ksircproc->TopList[qsname]->sirc_receive(line);