From 1b85a5fa06c80b010b7a93fbe0a60d3e5b07b0e3 Mon Sep 17 00:00:00 2001 From: Katayama Hirofumi MZ Date: Mon, 15 Apr 2024 09:41:01 +0900 Subject: [PATCH] [BROWSEUI] SHExplorerParseCmdLine: Fix parsing of /root (#6752) Remove excessive (!pInfo->pidlPath) check in SHExplorerParseCmdLine function. JIRA issue: CORE-16939 --- dll/win32/browseui/parsecmdline.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dll/win32/browseui/parsecmdline.cpp b/dll/win32/browseui/parsecmdline.cpp index 720b3084c5a..56e68f127ef 100644 --- a/dll/win32/browseui/parsecmdline.cpp +++ b/dll/win32/browseui/parsecmdline.cpp @@ -252,9 +252,8 @@ SHExplorerParseCmdLine(_Out_ PEXPLORER_CMDLINE_PARSE_RESULTS pInfo) PCWSTR strNextArg = _FindFirstField(strFieldArray); - BOOL hasNext = TRUE; + BOOL hasNext = _ReadNextArg(&strNextArg, strField, _countof(strField)); - hasNext = _ReadNextArg(&strNextArg, strField, _countof(strField)); while (TRUE) { // Basic flags-only params first @@ -319,9 +318,6 @@ SHExplorerParseCmdLine(_Out_ PEXPLORER_CMDLINE_PARSE_RESULTS pInfo) TRACE("CmdLine Parser: Found %S flag\n", strField); - if (!pInfo->pidlPath) - return FALSE; - if (!hasNext) return FALSE; @@ -414,7 +410,6 @@ SHExplorerParseCmdLine(_Out_ PEXPLORER_CMDLINE_PARSE_RESULTS pInfo) TRACE("CmdLine Parser: Parsed target path. dwFlags=%08lx, strPath=%S\n", pInfo->dwFlags, field); } } - } }