iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix CNick::Parse()

Browse Source 
If the mask started with ':', the following '!' was included to nick.
This commit is contained in:
J-P Nurmi
2014-11-01 13:05:51 +01:00
parent 5aa5e99a08
commit 8fdf51dfeb
3 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@@ -47,7 +47,7 @@ LIB_SRCS := $(addprefix src/,$(LIB_SRCS))
BIN_SRCS := src/main.cpp
LIB_OBJS := $(patsubst %cpp,%o,$(LIB_SRCS))
BIN_OBJS := $(patsubst %cpp,%o,$(BIN_SRCS))
TESTS := StringTest ConfigTest UtilsTest ThreadTest
TESTS := StringTest ConfigTest UtilsTest ThreadTest NickTest
TESTS := $(addprefix test/,$(addsuffix .o,$(TESTS)))
CLEAN := znc src/*.o test/*.o core core.* .version_extra .depend modules/.depend unittest
DISTCLEAN := Makefile config.log config.status znc-buildmod \

2
src/Nick.cpp
View File

@@ -49,7 +49,7 @@ void CNick::Parse(const CString& sNickMask) {
return;
}
m_sNick = sNickMask.substr((sNickMask[0] == ':'), uPos);
m_sNick = sNickMask.substr((sNickMask[0] == ':'), uPos - (sNickMask[0] == ':'));
m_sHost = sNickMask.substr(uPos +1);
if ((uPos = m_sHost.find('@')) != CString::npos) {

36
test/NickTest.cpp Normal file
View File

@@ -0,0 +1,36 @@
/*
* Copyright (C) 2004-2014 ZNC, see the NOTICE file for details.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <gtest/gtest.h>
#include <znc/Nick.h>
TEST(NickTest, Parse) {
CNick Nick1("nick!~ident@host");
EXPECT_EQ("nick", Nick1.GetNick());
EXPECT_EQ("~ident", Nick1.GetIdent());
EXPECT_EQ("host", Nick1.GetHost());
EXPECT_EQ("nick!~ident@host", Nick1.GetNickMask());
EXPECT_EQ("nick!~ident@host", Nick1.GetHostMask());
EXPECT_TRUE(Nick1.NickEquals("nick"));
CNick Nick2(":nick!~ident@host");
EXPECT_EQ("nick", Nick2.GetNick());
EXPECT_EQ("~ident", Nick2.GetIdent());
EXPECT_EQ("host", Nick2.GetHost());
EXPECT_EQ("nick!~ident@host", Nick2.GetNickMask());
EXPECT_EQ("nick!~ident@host", Nick2.GetHostMask());
EXPECT_TRUE(Nick2.NickEquals("nick"));
}