Fix bugs revealed by omittable exists variables.

Max Schaefer · Max Schaefer · commit 652b6bb8e19e · 2024-02-15T16:29:20.000Z
diff --git a/java/ql/automodel/src/AutomodelApplicationModeCharacteristics.qll b/java/ql/automodel/src/AutomodelApplicationModeCharacteristics.qll
@@ -256,7 +256,8 @@ module ApplicationCandidatesImpl implements SharedCharacteristics::CandidateSig
       string input
     |
       sinkSpec(e, package, type, subtypes, name, signature, ext, input) and
-      ExternalFlow::sinkModel(package, type, _, name, [signature, ""], ext, input, kind, provenance)
+      ExternalFlow::sinkModel(package, type, subtypes, name, [signature, ""], ext, input, kind,
+        provenance)
     )
     or
     isCustomSink(e, kind) and provenance = "custom-sink"
diff --git a/java/ql/automodel/src/AutomodelFrameworkModeCharacteristics.qll b/java/ql/automodel/src/AutomodelFrameworkModeCharacteristics.qll
@@ -214,7 +214,8 @@ module FrameworkCandidatesImpl implements SharedCharacteristics::CandidateSig {
       string input
     |
       sinkSpec(e, package, type, subtypes, name, signature, ext, input) and
-      ExternalFlow::sinkModel(package, type, _, name, [signature, ""], ext, input, kind, provenance)
+      ExternalFlow::sinkModel(package, type, subtypes, name, [signature, ""], ext, input, kind,
+        provenance)
     )
   }
 

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,8 @@ module ApplicationCandidatesImpl implements SharedCharacteristics::CandidateSig`
`256`	`256`	`string input`
`257`	`257`	`\|`
`258`	`258`	`sinkSpec(e, package, type, subtypes, name, signature, ext, input) and`
`259`		`- ExternalFlow::sinkModel(package, type, _, name, [signature, ""], ext, input, kind, provenance)`
	`259`	`+ ExternalFlow::sinkModel(package, type, subtypes, name, [signature, ""], ext, input, kind,`
	`260`	`+ provenance)`
`260`	`261`	`)`
`261`	`262`	`or`
`262`	`263`	`isCustomSink(e, kind) and provenance = "custom-sink"`
Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,8 @@ module FrameworkCandidatesImpl implements SharedCharacteristics::CandidateSig {`
`214`	`214`	`string input`
`215`	`215`	`\|`
`216`	`216`	`sinkSpec(e, package, type, subtypes, name, signature, ext, input) and`
`217`		`- ExternalFlow::sinkModel(package, type, _, name, [signature, ""], ext, input, kind, provenance)`
	`217`	`+ ExternalFlow::sinkModel(package, type, subtypes, name, [signature, ""], ext, input, kind,`
	`218`	`+ provenance)`
`218`	`219`	`)`
`219`	`220`	`}`
`220`	`221`