@@ -24,7 +24,7 @@ predicate constantBinaryExpression(BinaryExpr binary) {
2424}
2525
2626predicate onlyConstantExpressions ( Expr expr ) {
27- expr instanceof StringConstExpression or constantBinaryExpression ( expr ) or constantTernaryExpression ( expr )
27+ expr instanceof StringConstExpr or constantBinaryExpression ( expr ) or constantTernaryExpression ( expr )
2828}
2929
3030VarAccess getNonConstantVariableAssignment ( VarAccess varexpr ) {
@@ -39,7 +39,7 @@ VarAccess getNonConstantVariableAssignment(VarAccess varexpr) {
3939
4040VarAccess getParameterWithVariableScope ( VarAccess varexpr ) {
4141 exists ( Parameter parameter |
42- result = parameter .getName ( ) and
42+ result = parameter .getAnAccess ( ) and
4343 containsScope ( result , varexpr )
4444 )
4545}
@@ -48,16 +48,16 @@ Expr getAllSubExpressions(Expr expr)
4848{
4949 result = expr or
5050 result = getAllSubExpressions ( expr .( ArrayLiteral ) .getAnElement ( ) ) or
51- result = getAllSubExpressions ( expr .( ArrayExpr ) .getStatementBlock ( ) .getAStatement ( ) .( Pipeline ) .getAComponent ( ) .( CmdExpr ) .getExpr ( ) )
51+ result = getAllSubExpressions ( expr .( ArrayExpr ) .getStmtBlock ( ) .getAStmt ( ) .( Pipeline ) .getAComponent ( ) .( CmdExpr ) .getExpr ( ) )
5252}
5353
5454Expr dangerousCommandElement ( Cmd command )
5555{
5656 (
5757 command .getKind ( ) = 28 or
58- command .getName ( ) = "Invoke-Expression"
58+ command .getCommandName ( ) = "Invoke-Expression"
5959 ) and
60- result = getAllSubExpressions ( command .getAnElement ( ) )
60+ result = getAllSubExpressions ( command .getAnArgument ( ) )
6161}
6262
6363from Expr commandarg , VarAccess unknownDeclaration
0 commit comments