Author: tfaber Date: Fri Aug 28 10:51:10 2015 New Revision: 68846
URL: http://svn.reactos.org/svn/reactos?rev=68846&view=rev Log: [CMD] - In DirList, initialize stInfo.ptrHead of the dummy node to avoid invalid memory access. Fixes regression in cmd:batch
Modified: trunk/reactos/base/shell/cmd/dir.c
Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=68... ============================================================================== --- trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/dir.c [iso-8859-1] Fri Aug 28 10:51:10 2015 @@ -1376,6 +1376,7 @@ WARN("DEBUG: Cannot allocate memory for ptrStartNode!\n"); return 1; /* Error cannot allocate memory for 1st object */ } + ptrStartNode->stInfo.ptrHead = NULL; ptrNextNode = ptrStartNode;
/*Checking ir szPath is a File with/wout extension*/ @@ -1478,8 +1479,8 @@ ptrCurNode = &(*ptrCurNode)->ptrNext; }
- FindClose(hStreams); - *ptrCurNode = NULL; + FindClose(hStreams); + *ptrCurNode = NULL; } }
@@ -1538,12 +1539,12 @@ dwCount = 0; while (ptrNextNode->ptrNext) { - *(ptrFileArray + dwCount) = &ptrNextNode->ptrNext->stInfo; + ptrFileArray[dwCount] = &ptrNextNode->ptrNext->stInfo; ptrNextNode = ptrNextNode->ptrNext; dwCount++; }
- /* Sort Data if requested*/ + /* Sort Data if requested */ if (lpFlags->stOrderBy.sCriteriaCount > 0) QsortFiles(ptrFileArray, 0, dwCount-1, lpFlags);