fix(sonar): addressing reliability/security issues (#202)

utilities/Logs.cpp

@@ -80,29 +80,20 @@ std::mutex logMutex;
 
 void LogService()
 {
-	// prevent crash if mutex is not initialized
-	while (true)
-	{
-		try
-		{
-			logMutex.lock();
-			break;
-		}
-		catch (...) {}
-	}
-	logMutex.unlock();
-
 	while (!Global.applicationQuitOrder)
 	{
 		{
 			// --- Obsługa InfoStack ---
 			while (!InfoStack.empty())
 			{
-				logMutex.lock();
-				std::string msg = InfoStack.front().first;
-				bool isError = InfoStack.front().second;
-				InfoStack.pop_front();
-				logMutex.unlock();
+				std::string msg;
+				bool isError;
+				{
+					std::scoped_lock lock(logMutex);
+					msg = InfoStack.front().first;
+					isError = InfoStack.front().second;
+					InfoStack.pop_front();
+				}
 
 				// log to file
 				if (Global.iWriteLogEnabled & 1)
@@ -134,10 +125,12 @@ void LogService()
 			// --- Obsługa ErrorStack ---
 			while (!ErrorStack.empty())
 			{
-				logMutex.lock();
-				std::string msg = ErrorStack.front();
-				ErrorStack.pop_front();
-				logMutex.unlock();
+				std::string msg;
+				{
+					std::scoped_lock lock(logMutex);
+					msg = ErrorStack.front();
+					ErrorStack.pop_front();
+				}
 
 				if (!(Global.iWriteLogEnabled & 1))
 					continue;

utilities/parser.cpp

@@ -272,10 +272,9 @@ void cParser::stripFirstTokenBOM(std::string& token, bool ToLower, const char* B
 	}
 
 	// if first "token" was standalone BOM, read the next real token (avoid recursion)
-	while (token.empty() && mStream->peek() != EOF) {
-		readToken(token, ToLower, Break);
+	if (token.empty() && mStream->peek() != EOF) {
 		// readToken will not re-enter BOM stripping because mFirstToken is now false
-		break;
+		readToken(token, ToLower, Break);
 	}
 }
 

utilities/parser.h

@@ -39,7 +39,7 @@ class cParser //: public std::stringstream
 	Output_
 		getToken( bool const ToLower = true, char const *Break = "\n\r\t ;" ) {
             getTokens( 1, ToLower, Break );
-		    Output_ output;
+		    Output_ output{};
             *this >> output;
 		    return output; };
     inline