Fix incorrect std::string::operator[] usage

Passing a position equal to length() to the non-const version of operator[] is undefined

2 files changed, 3 insertions, 1 deletions

diff --git a/src/modules/m_check.cpp b/src/modules/m_check.cpp
index 9c5c414f1..5063368b8 100644
--- a/src/modules/m_check.cpp
+++ b/src/modules/m_check.cpp
@@ -174,7 +174,7 @@ class CommandCheck : public Command
 			/* /check on a channel */
 			user->SendText(checkstr + " timestamp " + timestring(targchan->age));
 
-			if (targchan->topic[0] != 0)
+			if (!targchan->topic.empty())
 			{
 				/* there is a topic, assume topic related information exists */
 				user->SendText(checkstr + " topic " + targchan->topic);
diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp
index 4db1f70b9..cad18cff4 100644
--- a/src/modules/m_namedmodes.cpp
+++ b/src/modules/m_namedmodes.cpp
@@ -65,6 +65,8 @@ class CommandProp : public Command
 		while (i < parameters.size())
 		{
 			std::string prop = parameters[i++];
+			if (prop.empty())
+				continue;
 			bool plus = prop[0] != '-';
 			if (prop[0] == '+' || prop[0] == '-')
 				prop.erase(prop.begin());