Eric Pouech : cmd: Skip too long paths.
Alexandre Julliard
julliard at winehq.org
Thu May 5 15:56:02 CDT 2022
Module: wine
Branch: master
Commit: 7de36f8e98b2cbbdcc360bdba96a5fe83e815d1a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7de36f8e98b2cbbdcc360bdba96a5fe83e815d1a
Author: Eric Pouech <eric.pouech at gmail.com>
Date: Fri Apr 29 15:13:25 2022 +0200
cmd: Skip too long paths.
Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/cmd/builtins.c | 22 +++++++++++++++++++++-
1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c
index dd3ebf76d50..dd3ae5b509b 100644
--- a/programs/cmd/builtins.c
+++ b/programs/cmd/builtins.c
@@ -1355,6 +1355,13 @@ static BOOL WCMD_delete_one (const WCHAR *thisArg) {
DIRECTORY_STACK *nextDir;
WCHAR subParm[MAX_PATH];
+ if (wcslen(thisDir) + wcslen(fd.cFileName) + 1 + wcslen(fname) + wcslen(ext) >= MAX_PATH)
+ {
+ WINE_TRACE("Skipping path too long %s%s\\%s%s\n",
+ debugstr_w(thisDir), debugstr_w(fd.cFileName),
+ debugstr_w(fname), debugstr_w(ext));
+ continue;
+ }
/* Work out search parameter in sub dir */
lstrcpyW (subParm, thisDir);
lstrcatW (subParm, fd.cFileName);
@@ -1761,7 +1768,14 @@ static void WCMD_add_dirstowalk(DIRECTORY_STACK *dirsToWalk) {
(lstrcmpW(fd.cFileName, L"..") != 0) && (lstrcmpW(fd.cFileName, L".") != 0))
{
/* Allocate memory, add to list */
- DIRECTORY_STACK *toWalk = heap_xalloc(sizeof(DIRECTORY_STACK));
+ DIRECTORY_STACK *toWalk;
+ if (wcslen(dirsToWalk->dirName) + 1 + wcslen(fd.cFileName) >= MAX_PATH)
+ {
+ WINE_TRACE("Skipping too long path %s\\%s\n",
+ debugstr_w(dirsToWalk->dirName), debugstr_w(fd.cFileName));
+ continue;
+ }
+ toWalk = heap_xalloc(sizeof(DIRECTORY_STACK));
WINE_TRACE("(%p->%p)\n", remainingDirs, remainingDirs->next);
toWalk->next = remainingDirs->next;
remainingDirs->next = toWalk;
@@ -2321,6 +2335,12 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) {
WINE_TRACE("Processing FOR filename %s\n", wine_dbgstr_w(fd.cFileName));
if (doRecurse) {
+ if (wcslen(dirsToWalk->dirName) + 1 + wcslen(fd.cFileName) >= MAX_PATH)
+ {
+ WINE_TRACE("Skipping too long path %s\\%s\n",
+ debugstr_w(dirsToWalk->dirName), debugstr_w(fd.cFileName));
+ continue;
+ }
lstrcpyW(fullitem, dirsToWalk->dirName);
lstrcatW(fullitem, L"\\");
lstrcatW(fullitem, fd.cFileName);
More information about the wine-cvs
mailing list