fix more UB

Dice-Developer-Team · Nov 23, 2018 · 6573493 · 6573493
1 parent 9b30d18
commit 6573493
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/Dice/Dice.cpp b/Dice/Dice.cpp
@@ -347,7 +347,7 @@ EVE_PrivateMsg_EX(__eventPrivateMsg)
 	eve.message_block();
 	const string strNickName = getName(eve.fromQQ);
 	string strLowerMessage = eve.message;
-	transform(strLowerMessage.begin(), strLowerMessage.end(), strLowerMessage.begin(), tolower);
+	transform(strLowerMessage.begin(), strLowerMessage.end(), strLowerMessage.begin(), [](unsigned char c) { return tolower(c); });
 	if (strLowerMessage.substr(intMsgCnt, 4) == "help")
 	{
 		AddMsgToQueue(GlobalMsg["strHlpMsg"], eve.fromQQ);
@@ -788,7 +788,7 @@ EVE_PrivateMsg_EX(__eventPrivateMsg)
 			intMsgCnt++;
 		string strSearch = eve.message.substr(intMsgCnt);
 		for (auto& n : strSearch)
-			n = toupper(n);
+			n = toupper(static_cast<unsigned char>(n));
 		string strReturn;
 		if (RuleGetter->analyze(strSearch, strReturn))
 		{
@@ -1480,7 +1480,7 @@ EVE_GroupMsg_EX(__eventGroupMsg)
 	eve.message_block();
 	const string strNickName = getName(eve.fromQQ, eve.fromGroup);
 	string strLowerMessage = eve.message;
-	transform(strLowerMessage.begin(), strLowerMessage.end(), strLowerMessage.begin(), tolower);
+	transform(strLowerMessage.begin(), strLowerMessage.end(), strLowerMessage.begin(), [](unsigned char c) { return tolower(c); });
 	if (strLowerMessage.substr(intMsgCnt, 3) == "bot")
 	{
 		intMsgCnt += 3;
@@ -2545,7 +2545,7 @@ EVE_GroupMsg_EX(__eventGroupMsg)
 			intMsgCnt++;
 		string strSearch = eve.message.substr(intMsgCnt);
 		for (auto& n : strSearch)
-			n = toupper(n);
+			n = toupper(static_cast<unsigned char>(n));
 		string strReturn;
 		if (RuleGetter->analyze(strSearch, strReturn))
 		{
@@ -3191,7 +3191,7 @@ EVE_DiscussMsg_EX(__eventDiscussMsg)
 	eve.message_block();
 	const string strNickName = getName(eve.fromQQ, eve.fromDiscuss);
 	string strLowerMessage = eve.message;
-	transform(strLowerMessage.begin(), strLowerMessage.end(), strLowerMessage.begin(), tolower);
+	transform(strLowerMessage.begin(), strLowerMessage.end(), strLowerMessage.begin(), [](unsigned char c) { return tolower(c); });
 	if (strLowerMessage.substr(intMsgCnt, 3) == "bot")
 	{
 		intMsgCnt += 3;
@@ -4122,7 +4122,7 @@ EVE_DiscussMsg_EX(__eventDiscussMsg)
 			intMsgCnt++;
 		string strSearch = eve.message.substr(intMsgCnt);
 		for (auto& n : strSearch)
-			n = toupper(n);
+			n = toupper(static_cast<unsigned char>(n));
 		string strReturn;
 		if (RuleGetter->analyze(strSearch, strReturn))
 		{

diff --git a/Dice/GetRule.cpp b/Dice/GetRule.cpp
@@ -95,7 +95,7 @@ bool GetRule::analyze(string& rawStr, string& des)
 		des = GlobalMsg["strRulesFailedErr"];
 		return false;
 	}
-	for (auto& chr : rawStr)chr = toupper(chr);
+	for (auto& chr : rawStr)chr = toupper(static_cast<unsigned char> (chr));
 
 	if (rawStr.find(':') != string::npos)
 	{

diff --git a/Dice/RD.h b/Dice/RD.h
@@ -208,7 +208,7 @@ class RD
 		bool boolContainK = false;
 		for (auto& i : dice)
 		{
-			i = toupper(i);
+			i = toupper(static_cast<unsigned char>(i));
 			if (!isdigit(static_cast<unsigned char>(i)))
 			{
 				if (i == 'D')
@@ -388,11 +388,11 @@ class RD
 		{
 			if (i != 'a' && i != 'A')
 			{
-				i = toupper(i);
+				i = toupper(static_cast<unsigned char>(i));
 			}
 			else
 			{
-				i = tolower(i);
+				i = tolower(static_cast<unsigned char>(i));
 			}
 		}
 		if (strDice.empty())
@@ -443,11 +443,11 @@ class RD
 		{
 			if (i != 'a' && i != 'A')
 			{
-				i = toupper(i);
+				i = toupper(static_cast<unsigned char>(i));
 			}
 			else
 			{
-				i = tolower(i);
+				i = tolower(static_cast<unsigned char>(i));
 			}
 		}
 		if (strDice.empty())