mirrors
/
FreeRDP
mirror of https://github.com/FreeRDP/FreeRDP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed memory leak.

This commit is contained in:
Armin Novak 2014-11-16 22:47:23 +01:00
parent be3df80c9c
commit 709435d6d7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winpr/libwinpr/environment/environment.c
View File

@ -345,7 +345,10 @@ LPCH MergeEnvironmentStrings(PCSTR original, PCSTR merge)
lpszEnvironmentBlock = (LPCH) malloc(cchEnvironmentBlock * sizeof(CHAR));
if (!lpszEnvironmentBlock)
{
free (mergeStrings);
return NULL;
}
envp = original;
@ -361,8 +364,8 @@ LPCH MergeEnvironmentStrings(PCSTR original, PCSTR merge)
if (!tmp)
{
if (lpszEnvironmentBlock)
free (lpszEnvironmentBlock);
free (lpszEnvironmentBlock);
free (mergeStrings);
return NULL;
}
lpszEnvironmentBlock = tmp;
@ -404,6 +407,7 @@ LPCH MergeEnvironmentStrings(PCSTR original, PCSTR merge)
{
if (lpszEnvironmentBlock)
free(lpszEnvironmentBlock);
free (mergeStrings);
return NULL;
}
lpszEnvironmentBlock = tmp;
@ -447,6 +451,7 @@ LPCH MergeEnvironmentStrings(PCSTR original, PCSTR merge)
{
if (lpszEnvironmentBlock)
free(lpszEnvironmentBlock);
free (mergeStrings);
return NULL;
}