* Fix #116.

DiscordMessenger · Jul 11, 2024 · 54b8973 · 54b8973
1 parent 53951a0
commit 54b8973
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/discord/FormattedText.cpp b/src/discord/FormattedText.cpp
@@ -710,7 +710,7 @@ void FormattedText::UseRegex(std::string& str)
 	// Not too expensive I hope!
 	if (flags & HAS_BSLASH)
 	{
-		for (size_t i = 0; i < str.size() - 1; i++) {
+		for (size_t i = 0; !str.empty() && i < str.size() - 1; i++) {
 			if (str[i] != '\\')
 				continue;
 
@@ -733,15 +733,15 @@ void FormattedText::UseRegex(std::string& str)
 	}
 	if (flags & HAS_QUOTE)
 	{
-		for (size_t i = 0; i < str.size() - 2; i++) {
+		for (size_t i = 0; str.size() > 2 && i < str.size() - 2; i++) {
 
 			if ((i == 0 || str[i - 1] == '\n') && str[i] == '>' && str[i + 1] == ' ')
 				str[i] = CHAR_BEG_QUOTE, str[i + 1] = CHAR_NOOP;
 		}
 	}
 	if (flags & HAS_AT)
 	{
-		for (size_t i = 0; i < str.size() - 2; i++) {
+		for (size_t i = 0; str.size() > 2 && i < str.size() - 2; i++) {
 			if (str[i] != '@')
 				continue;