Fixed crash with invalid category. Fixes #945.

leozide · Oct 18, 2024 · 88a2308 · 88a2308
1 parent 3bf1420
commit 88a2308
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/common/lc_category.cpp b/common/lc_category.cpp
@@ -184,7 +184,7 @@ bool lcMatchCategory(const char* PieceName, const char* Expression)
 		}
 		else if ((*p == '|') || (*p == '&'))
 		{
-			std::string LeftStr(Expression, (p - Expression) - 1);
+			std::string LeftStr(Expression, std::max(p - Expression, static_cast<ptrdiff_t>(1)) - 1);
 			std::string RightStr(p + 1);
 
 			if (*p == '|')
@@ -258,6 +258,9 @@ bool lcMatchCategory(const char* PieceName, const char* Expression)
 		Word++;
 	}
 
+	if (!Word[0])
+		return false;
+
 	const char* Result = strcasestr(PieceName, Word);
 
 	if (!Result)