for invalid regex

ca26d548 · nanahira · 1ad5b7b9 · ca26d548
Commit ca26d548 authored Nov 16, 2018 by nanahira
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 8 deletions

gframe/game.cpp gframe/game.cpp +20 -8

No files found.
--- a/gframe/game.cpp
+++ b/gframe/game.cpp
@@ -2082,18 +2082,30 @@ void Game::takeScreenshot() {
 bool Game::CheckRegEx(const wchar_t* text, const wchar_t* exp, bool exact) {
 	//if(std::wregex(exp) == NULL)
 	//	return false;
-	if(exact)
+	bool result;
-		return !!std::regex_match(text, std::wregex(exp));
+	try {
-	else
+		if(exact)
-		return !!std::regex_search(text, std::wregex(exp));
+			result = std::regex_match(text, std::wregex(exp));
+		else
+			result = std::regex_search(text, std::wregex(exp));
+	} catch(...) {
+		result = false;
+	}
+	return result;
 }
 bool Game::CheckRegEx(std::wstring text, const wchar_t* exp, bool exact) {
 	//if(std::wregex(exp) == NULL)
 	//	return false;
-	if(exact)
+	bool result;
-		return !!std::regex_match(text, std::wregex(exp));
+	try {
-	else
+		if(exact)
-		return !!std::regex_search(text, std::wregex(exp));
+			result = std::regex_match(text, std::wregex(exp));
+		else
+			result = std::regex_search(text, std::wregex(exp));
+	} catch(...) {
+		result = false;
+	}
+	return result;
 }
 const char* Game::GetLocaleDir(const char* dir) {
 	if(!gameConf.locale || !wcscmp(gameConf.locale, L"default"))