Restrict param2return value features

Benjamin Muskalla · Benjamin Muskalla · commit cce378048105 · 2021-11-15T09:57:23.000+01:00
diff --git a/java/ql/src/utils/model-generator/CaptureSummaryModels.ql b/java/ql/src/utils/model-generator/CaptureSummaryModels.ql
@@ -192,6 +192,10 @@ class ParameterToReturnValueTaintConfig extends TaintTracking::Configuration {
   override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {
     node2.asExpr().(ConstructorCall).getAnArgument() = node1.asExpr()
   }
+
+  override DataFlow::FlowFeature getAFeature() {
+    result instanceof DataFlow::FeatureEqualSourceSinkCallContext
+  }
 }
 
 predicate paramFlowToReturnValueExists(Parameter p) {
diff --git a/java/ql/src/utils/model-generator/GenerateFlowModel.py b/java/ql/src/utils/model-generator/GenerateFlowModel.py
@@ -80,7 +80,7 @@ def runQuery(infoMessage, query):
         __file__), query)
     resultBqrs = os.path.join(workDir, "out.bqrs")
     cmd = ['codeql', 'query', 'run', queryFile, '--database',
-           database, '--output', resultBqrs]
+           database, '--output', resultBqrs, '--threads', '8']
 
     ret = subprocess.call(cmd)
     if ret != 0:

Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,10 @@ class ParameterToReturnValueTaintConfig extends TaintTracking::Configuration {`
`192`	`192`	`override predicate isAdditionalTaintStep(DataFlow::Node node1, DataFlow::Node node2) {`
`193`	`193`	`node2.asExpr().(ConstructorCall).getAnArgument() = node1.asExpr()`
`194`	`194`	`}`
	`195`	`+`
	`196`	`+ override DataFlow::FlowFeature getAFeature() {`
	`197`	`+ result instanceof DataFlow::FeatureEqualSourceSinkCallContext`
	`198`	`+ }`
`195`	`199`	`}`
`196`	`200`
`197`	`201`	`predicate paramFlowToReturnValueExists(Parameter p) {`