Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 20:47:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMD] Add missing memory allocation NULL checks (#161). CORE-8304

Browse source 
Adapted from a patch by Jacob S. Preciado.

Bring also the code suggestions emitted during review.
This commit is contained in:
Hermès Bélusca-Maïto 2017-12-03 18:49:41 +01:00
parent 73798d2e71
commit 3f892a8d6b
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
16 changed files with 293 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

18
base/shell/cmd/where.c
View file

@ -149,13 +149,20 @@ SearchForExecutable (LPCTSTR pFileName, LPTSTR pFullName)
/* load environment variable PATHEXT */
pszPathExt = (LPTSTR)cmd_alloc (ENV_BUFFER_SIZE * sizeof(TCHAR));
if (!pszPathExt)
{
WARN("Cannot allocate memory for pszPathExt!\n");
return FALSE;
}
dwBuffer = GetEnvironmentVariable (_T("PATHEXT"), pszPathExt, ENV_BUFFER_SIZE);
if (dwBuffer > ENV_BUFFER_SIZE)
{
LPTSTR pszOldPathExt = pszPathExt;
pszPathExt = (LPTSTR)cmd_realloc (pszPathExt, dwBuffer * sizeof (TCHAR));
if (pszPathExt == NULL)
if (!pszPathExt)
{
WARN("Cannot reallocate memory for pszPathExt!\n");
cmd_free(pszOldPathExt);
return FALSE;
}
@ -187,13 +194,20 @@ SearchForExecutable (LPCTSTR pFileName, LPTSTR pFullName)
/* load environment variable PATH into buffer */
pszPath = (LPTSTR)cmd_alloc (ENV_BUFFER_SIZE * sizeof(TCHAR));
if (!pszPath)
{
WARN("Cannot allocate memory for pszPath!\n");
return FALSE;
}
dwBuffer = GetEnvironmentVariable (_T("PATH"), pszPath, ENV_BUFFER_SIZE);
if (dwBuffer > ENV_BUFFER_SIZE)
{
LPTSTR pszOldPath = pszPath;
pszPath = (LPTSTR)cmd_realloc (pszPath, dwBuffer * sizeof (TCHAR));
if (pszPath == NULL)
if (!pszPath)
{
WARN("Cannot reallocate memory for pszPath!\n");
cmd_free(pszOldPath);
cmd_free(pszPathExt);
return FALSE;