Skip to content

Commit d22fef8

Browse files
committed
Better cleanup lines coming from network.
Thanks for Jeriko One <jeriko.one@gmx.us> for finding and reporting this.
1 parent a7bfbd9 commit d22fef8

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Diff for: src/Client.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ void CClient::ReadLine(const CString& sData) {
103103
CLanguageScope user_lang(GetUser() ? GetUser()->GetLanguage() : "");
104104
CString sLine = sData;
105105

106-
sLine.TrimRight("\n\r");
106+
sLine.Replace("\n", "");
107+
sLine.Replace("\r", "");
107108

108109
DEBUG("(" << GetFullName() << ") CLI -> ZNC ["
109110
<< CDebug::Filter(sLine) << "]");

Diff for: src/IRCSock.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,8 @@ void CIRCSock::Quit(const CString& sQuitMsg) {
156156
void CIRCSock::ReadLine(const CString& sData) {
157157
CString sLine = sData;
158158

159-
sLine.TrimRight("\n\r");
159+
sLine.Replace("\n", "");
160+
sLine.Replace("\r", "");
160161

161162
DEBUG("(" << m_pNetwork->GetUser()->GetUserName() << "/"
162163
<< m_pNetwork->GetName() << ") IRC -> ZNC [" << sLine << "]");

0 commit comments

Comments
 (0)