Merge pull request #4524 from tausbn/python-remove-cartesian-product-in-tkwoverflownode

RasmusWL · web-flow · commit ba9caacee176 · 2020-10-21T10:22:45.000+02:00
Python: Remove cartesian product in `TKwOverflowNode`
diff --git a/python/ql/src/experimental/dataflow/internal/DataFlowPrivate.qll b/python/ql/src/experimental/dataflow/internal/DataFlowPrivate.qll
@@ -292,7 +292,7 @@ private Node update(Node node) {
  * `y`. There is a dataflow step from `**{"y": 1, "a": 3}` to `[**d]` to transfer the content and
  * a clearing of content at key `y` for node `[**d]`, since that value has been unpacked.
  */
-private module ArgumentPassing {
+module ArgumentPassing {
   /**
    * Holds if `call` represents a `DataFlowCall` to a `DataFlowCallable` represented by `callable`.
    *
diff --git a/python/ql/src/experimental/dataflow/internal/DataFlowPublic.qll b/python/ql/src/experimental/dataflow/internal/DataFlowPublic.qll
@@ -49,6 +49,7 @@ newtype TNode =
   TKwOverflowNode(CallNode call, CallableValue callable) {
     exists(getKeywordOverflowArg(call, callable, _))
     or
+    ArgumentPassing::connects(call, callable) and
     exists(call.getNode().getKwargs()) and
     callable.getScope().hasKwArg()
   } or

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ private Node update(Node node) {`
`292`	`292`	* `y`. There is a dataflow step from `{"y": 1, "a": 3}` to `[d]` to transfer the content and
`293`	`293`	* a clearing of content at key `y` for node `[**d]`, since that value has been unpacked.
`294`	`294`	`*/`
`295`		`-private module ArgumentPassing {`
	`295`	`+module ArgumentPassing {`
`296`	`296`	`/**`
`297`	`297`	* Holds if `call` represents a `DataFlowCall` to a `DataFlowCallable` represented by `callable`.
`298`	`298`	`*`