Python: Fix getArgumentForCall when using keyword arguments

RasmusWL · RasmusWL · commit e9859ad96d26 · 2020-05-04T20:50:56.000+02:00
Yikes :|
diff --git a/python/ql/src/semmle/python/objects/ObjectAPI.qll b/python/ql/src/semmle/python/objects/ObjectAPI.qll
@@ -363,7 +363,7 @@ class CallableValue extends Value {
             or
             exists(string name |
                 call.getArgByName(name) = result and
-                this.(PythonFunctionObjectInternal).getScope().getArg(n + offset).getName() = name
+                this.(PythonFunctionObjectInternal).getScope().getArg(n).getName() = name
             )
             or
             called instanceof BoundMethodObjectInternal and
diff --git a/python/ql/test/library-tests/PointsTo/calls/getArgumentForCall.expected b/python/ql/test/library-tests/PointsTo/calls/getArgumentForCall.expected
@@ -19,5 +19,5 @@
 | 40 | ControlFlowNode for f() | Function f | 0 | ControlFlowNode for IntegerLiteral |
 | 40 | ControlFlowNode for f() | Function f | 1 | ControlFlowNode for IntegerLiteral |
 | 40 | ControlFlowNode for f() | Function f | 2 | ControlFlowNode for IntegerLiteral |
-| 42 | ControlFlowNode for Attribute() | Function C.n | 0 | ControlFlowNode for IntegerLiteral |
 | 42 | ControlFlowNode for Attribute() | Function C.n | 0 | ControlFlowNode for c |
+| 42 | ControlFlowNode for Attribute() | Function C.n | 1 | ControlFlowNode for IntegerLiteral |

Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ class CallableValue extends Value {`
`363`	`363`	`or`
`364`	`364`	`exists(string name \|`
`365`	`365`	`call.getArgByName(name) = result and`
`366`		`- this.(PythonFunctionObjectInternal).getScope().getArg(n + offset).getName() = name`
	`366`	`+ this.(PythonFunctionObjectInternal).getScope().getArg(n).getName() = name`
`367`	`367`	`)`
`368`	`368`	`or`
`369`	`369`	`called instanceof BoundMethodObjectInternal and`