@@ -816,18 +816,25 @@ function windowsShellPayloadProgramName(
816816 tokens : ReadonlyArray < string > ,
817817 start : number ,
818818 depth : number ,
819+ remainingCommand : string | null ,
820+ separator : string | null ,
819821 segmentsRemaining : number ,
820822) : WindowsShellPayload {
823+ const parsePayload = ( payload : string | undefined ) : string | null => {
824+ if ( ! payload ) return null ;
825+ const command =
826+ remainingCommand && separator ? `${ payload } ${ separator } ${ remainingCommand } ` : payload ;
827+ return commandProgramNameInternal ( command , depth + 1 , "shell" , segmentsRemaining ) ;
828+ } ;
829+
821830 if ( shell === "cmd" || shell === "cmd.exe" ) {
822831 for ( let index = start ; index < tokens . length ; index += 1 ) {
823832 const option = tokens [ index ] ! . toLowerCase ( ) ;
824833 if ( option !== "/c" && option !== "/k" ) continue ;
825834 const payload = tokens [ index + 1 ] ;
826835 return {
827836 matched : true ,
828- program : payload
829- ? commandProgramNameInternal ( payload , depth + 1 , "shell" , segmentsRemaining )
830- : null ,
837+ program : parsePayload ( payload ) ,
831838 } ;
832839 }
833840 return { matched : false , program : null } ;
@@ -839,9 +846,7 @@ function windowsShellPayloadProgramName(
839846 const payload = tokens [ index + 1 ] ;
840847 return {
841848 matched : true ,
842- program : payload
843- ? commandProgramNameInternal ( payload , depth + 1 , "shell" , segmentsRemaining )
844- : null ,
849+ program : parsePayload ( payload ) ,
845850 } ;
846851 }
847852 if ( option === "-file" || option === "-f" ) {
@@ -1234,6 +1239,8 @@ function parseCommandProgramName(
12341239 tokens ,
12351240 index + 1 ,
12361241 depth ,
1242+ commandSplit . remainingCommand ,
1243+ commandSplit . separator ,
12371244 segmentsRemaining ,
12381245 ) ;
12391246 if ( payload . matched ) return payload . program ;
0 commit comments