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

Fix a memory leak in the dir command

Browse source 
svn path=/trunk/; revision=28073
This commit is contained in:
Thomas Bluemel 2007-08-01 14:32:57 +00:00
parent c16f477a80
commit e42a8d41ff
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
reactos/base/shell/cmd/dir.c
View file

@ -1954,10 +1954,11 @@ CommandDir(LPTSTR first, LPTSTR rest)
TCHAR cDrive; TCHAR cDrive;
TCHAR szPath[MAX_PATH]; TCHAR szPath[MAX_PATH];
TCHAR szFilespec[MAX_PATH]; TCHAR szFilespec[MAX_PATH];
LPTSTR* params; LPTSTR* params = NULL;
INT entries = 0; INT entries = 0;
UINT loop = 0; UINT loop = 0;
DIRSWITCHFLAGS stFlags; DIRSWITCHFLAGS stFlags;
INT ret = 1;
/* Initialize variables */ /* Initialize variables */
cDrive = 0; cDrive = 0;
@ -1992,21 +1993,21 @@ CommandDir(LPTSTR first, LPTSTR rest)
if (!DirReadParam(dircmd, &params, &entries, &stFlags)) if (!DirReadParam(dircmd, &params, &entries, &stFlags))
{ {
nErrorLevel = 1; nErrorLevel = 1;
return 1; goto cleanup;
} }
/* read the parameters */ /* read the parameters */
if (!DirReadParam(rest, &params, &entries, &stFlags) || CheckCtrlBreak(BREAK_INPUT)) if (!DirReadParam(rest, &params, &entries, &stFlags) || CheckCtrlBreak(BREAK_INPUT))
{ {
nErrorLevel = 1; nErrorLevel = 1;
return 1; goto cleanup;
} }
/* default to current directory */ /* default to current directory */
if(entries == 0) { if(entries == 0) {
if(!add_entry(&entries, &params, _T("."))) { if(!add_entry(&entries, &params, _T("."))) {
nErrorLevel = 1; nErrorLevel = 1;
return 1; goto cleanup;
} }
} }
@ -2016,7 +2017,7 @@ CommandDir(LPTSTR first, LPTSTR rest)
if (DirParsePathspec (params[loop], szPath, szFilespec) || CheckCtrlBreak(BREAK_INPUT)) if (DirParsePathspec (params[loop], szPath, szFilespec) || CheckCtrlBreak(BREAK_INPUT))
{ {
nErrorLevel = 1; nErrorLevel = 1;
return 1; goto cleanup;
} }
/* <Debug :> /* <Debug :>
@ -2047,7 +2048,7 @@ CommandDir(LPTSTR first, LPTSTR rest)
if(cDrive != szPath[0] && !stFlags.bBareFormat) { if(cDrive != szPath[0] && !stFlags.bBareFormat) {
if (!PrintDirectoryHeader (szPath, &stFlags)) { if (!PrintDirectoryHeader (szPath, &stFlags)) {
nErrorLevel = 1; nErrorLevel = 1;
return 1; goto cleanup;
} }
cDrive = szPath[0]; cDrive = szPath[0];
@ -2058,7 +2059,7 @@ CommandDir(LPTSTR first, LPTSTR rest)
if (DirList (szPath, szFilespec, &stFlags)) if (DirList (szPath, szFilespec, &stFlags))
{ {
nErrorLevel = 1; nErrorLevel = 1;
return 1; goto cleanup;
} }
} }
@ -2068,8 +2069,13 @@ CommandDir(LPTSTR first, LPTSTR rest)
recurse_dir_cnt, recurse_dir_cnt,
recurse_bytes, recurse_bytes,
&stFlags); &stFlags);
return 0; ret = 0;
cleanup:
freep(params);
return ret;
} }
#endif #endif