Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-06 23:22:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

[EXPLORER] Allocate the string for expanded command line from heap

Browse source 
Addendum to 6fe704b.

CORE-12973 CORE-17168
This commit is contained in:
Stanislav Motylkov 2020-07-21 19:50:45 +03:00
parent 6fe704b0f0
commit 21b56d77c6
No known key found for this signature in database
GPG key ID: AFE513258CBA9E92
1 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

28
base/shell/explorer/startup.cpp
View file

@ -229,6 +229,7 @@ static BOOL ProcessRunKeys(HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete,
while (i > 0) while (i > 0)
{ {
WCHAR *szCmdLineExp = NULL;
DWORD cchValLength = cchMaxValue, cbDataLength = cbMaxCmdLine; DWORD cchValLength = cchMaxValue, cbDataLength = cbMaxCmdLine;
DWORD type; DWORD type;
@ -266,18 +267,37 @@ static BOOL ProcessRunKeys(HKEY hkRoot, LPCWSTR szKeyName, BOOL bDelete,
if (type == REG_EXPAND_SZ) if (type == REG_EXPAND_SZ)
{ {
WCHAR szCmdLineExp[MAX_PATH + 1] = L"\0"; DWORD dwNumOfChars;
if (ExpandEnvironmentStringsW(szCmdLine, szCmdLineExp, _countof(szCmdLineExp))) dwNumOfChars = ExpandEnvironmentStringsW(szCmdLine, NULL, 0);
StringCbCopyW(szCmdLine, cbMaxCmdLine, szCmdLineExp); if (dwNumOfChars)
{
szCmdLineExp = (WCHAR *)HeapAlloc(hProcessHeap, 0, dwNumOfChars * sizeof(*szCmdLineExp));
if (szCmdLineExp == NULL)
{
TRACE("Couldn't allocate memory for the commands to be executed\n");
res = ERROR_NOT_ENOUGH_MEMORY;
goto end;
} }
res = runCmd(szCmdLine, NULL, bSynchronous, FALSE); ExpandEnvironmentStringsW(szCmdLine, szCmdLineExp, dwNumOfChars);
}
}
res = runCmd(szCmdLineExp ? szCmdLineExp : szCmdLine, NULL, bSynchronous, FALSE);
if (res == INVALID_RUNCMD_RETURN) if (res == INVALID_RUNCMD_RETURN)
{ {
TRACE("Error running cmd #%lu (%lu)\n", i, GetLastError()); TRACE("Error running cmd #%lu (%lu)\n", i, GetLastError());
} }
if (szCmdLineExp != NULL)
{
HeapFree(hProcessHeap, 0, szCmdLineExp);
szCmdLineExp = NULL;
}
TRACE("Done processing cmd #%lu\n", i); TRACE("Done processing cmd #%lu\n", i);
} }