chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Fixed infinite loop when a Rainmeter.exe is called with a bang containing square brackets (e.g. Rainmeter.exe !Bang "[Text]")

Browse Source
This commit is contained in:
Birunthan Mohanathas 2011-11-08 18:19:34 +00:00
parent 569a151c6c
commit dfd53fb158
2 changed files with 5 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
Library/Rainmeter.cpp
View File

@ -2007,75 +2007,6 @@ BOOL CRainmeter::ExecuteBang(const std::wstring& bang, const std::wstring& arg,
return TRUE; return TRUE;
} }
/*
** ParseCommand
**
** Replaces the measure names with the actual text values.
**
*/
std::wstring CRainmeter::ParseCommand(const WCHAR* command, CMeterWindow* meterWindow)
{
std::wstring strCommand = command;
if (_wcsnicmp(L"!execute", command, 8) == 0)
{
return strCommand;
}
// Find the [measures]
size_t start = 0, end = 0;
while (start != std::wstring::npos && end != std::wstring::npos)
{
start = strCommand.find(L'[', start);
if (start != std::wstring::npos)
{
end = strCommand.find(L']', start + 1);
if (end != std::wstring::npos)
{
std::wstring measureName = strCommand.substr(start + 1, end - (start + 1));
if (!measureName.empty() && measureName[0] != L'!') // Ignore bangs
{
if (meterWindow)
{
if (strCommand[start + 1] == L'*' && strCommand[end - 1] == L'*')
{
strCommand.erase(start + 1, 1);
strCommand.erase(end - 2, 1);
start = end - 1;
}
else
{
const std::list<CMeasure*>& measures = meterWindow->GetMeasures();
std::list<CMeasure*>::const_iterator iter = measures.begin();
for ( ; iter != measures.end(); ++iter)
{
if (_wcsicmp((*iter)->GetName(), measureName.c_str()) == 0)
{
std::wstring value = (*iter)->GetStringValue(AUTOSCALE_OFF, 1, -1, false);
strCommand.replace(start, (end - start) + 1, value);
start += value.length();
break;
}
}
if (iter == measures.end())
{
//LogWithArgs(LOG_WARNING, L"No such measure [%s] for execute string: %s", measureName.c_str(), command);
start = end + 1;
}
}
}
}
else
{
start = end + 1;
}
}
}
}
return strCommand;
}
/* /*
** ExecuteCommand ** ExecuteCommand
** **
@ -2084,9 +2015,11 @@ std::wstring CRainmeter::ParseCommand(const WCHAR* command, CMeterWindow* meterW
*/ */
void CRainmeter::ExecuteCommand(const WCHAR* command, CMeterWindow* meterWindow) void CRainmeter::ExecuteCommand(const WCHAR* command, CMeterWindow* meterWindow)
{ {
if (command == NULL) return; std::wstring strCommand = command;
if (meterWindow && _wcsnicmp(L"!execute", command, 8) != 0)
std::wstring strCommand = ParseCommand(command, meterWindow); {
meterWindow->GetParser().ReplaceMeasures(strCommand);
}
if (!strCommand.empty()) if (!strCommand.empty())
{ {

1
Library/Rainmeter.h
View File

@ -159,7 +159,6 @@ public:
const std::wstring& GetTrayExecuteDM() { return m_TrayExecuteDM; } const std::wstring& GetTrayExecuteDM() { return m_TrayExecuteDM; }
BOOL ExecuteBang(const std::wstring& bang, const std::wstring& arg, CMeterWindow* meterWindow); BOOL ExecuteBang(const std::wstring& bang, const std::wstring& arg, CMeterWindow* meterWindow);
std::wstring ParseCommand(const WCHAR* command, CMeterWindow* meterWindow);
void ExecuteCommand(const WCHAR* command, CMeterWindow* meterWindow); void ExecuteCommand(const WCHAR* command, CMeterWindow* meterWindow);
void RefreshAll(); void RefreshAll();