cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

znc: backport CVE fixes to 1.6

Browse Source 
Backport fixes for CVEs CVE-2018-14055 and CVE-2018-14056.

Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
This commit is contained in:
Jonas Gorski
2019-04-01 11:19:15 +02:00
parent f91539e92f
commit b7bcf24a00
4 changed files with 110 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/znc/patches/002-Better-cleanup-lines-coming-from-network.patch
+35
View File
@@ -0,0 +1,35 @@
From ff15cb3288b96e16c2cf01d511cc082d65272699 Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+znc@asokolov.org>
Date: Fri, 13 Jul 2018 22:50:47 +0100
Subject: [PATCH 2/6] Better cleanup lines coming from network.
Thanks for Jeriko One <jeriko.one@gmx.us> for finding and reporting this.
---
src/Client.cpp | 3 ++-
src/IRCSock.cpp | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
--- a/src/Client.cpp
+++ b/src/Client.cpp
@@ -97,7 +97,8 @@ void CClient::SendRequiredPasswordNotice
void CClient::ReadLine(const CString& sData) {
CString sLine = sData;
- sLine.TrimRight("\n\r");
+ sLine.Replace("\n", "");
+ sLine.Replace("\r", "");
DEBUG("(" << GetFullName() << ") CLI -> ZNC [" << sLine << "]");
--- a/src/IRCSock.cpp
+++ b/src/IRCSock.cpp
@@ -132,7 +132,8 @@ void CIRCSock::Quit(const CString& sQuit
void CIRCSock::ReadLine(const CString& sData) {
CString sLine = sData;
- sLine.TrimRight("\n\r");
+ sLine.Replace("\n", "");
+ sLine.Replace("\r", "");
DEBUG("(" << m_pNetwork->GetUser()->GetUserName() << "/" << m_pNetwork->GetName() << ") IRC -> ZNC [" << sLine << "]");