Java, C#: Ensure variable is used in all disjuncts

paldepind · paldepind · commit 70550950d8d6 · 2025-01-29T10:30:26.000+01:00
diff --git a/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll b/csharp/ql/src/utils/modelgenerator/internal/CaptureModels.qll
@@ -372,7 +372,7 @@ module ModelGeneratorInput implements ModelGeneratorInputSig<Location, CsharpDat
     or
     i = 4 and ExternalFlow::partialModel(api, _, _, _, _, result) // parameters
     or
-    i = 5 and result = "" // ext
+    i = 5 and result = "" and exists(api) // ext
   }
 
   string partialNeutralModelRow(Callable api, int i) {
diff --git a/java/ql/src/utils/modelgenerator/internal/CaptureModels.qll b/java/ql/src/utils/modelgenerator/internal/CaptureModels.qll
@@ -293,7 +293,7 @@ module ModelGeneratorInput implements ModelGeneratorInputSig<Location, JavaDataF
     or
     i = 4 and result = ExternalFlow::paramsString(api) // parameters
     or
-    i = 5 and result = "" // ext
+    i = 5 and result = "" and exists(api) // ext
   }
 
   string partialNeutralModelRow(Callable api, int i) {

Original file line number	Diff line number	Diff line change
`@@ -372,7 +372,7 @@ module ModelGeneratorInput implements ModelGeneratorInputSig<Location, CsharpDat`
`372`	`372`	`or`
`373`	`373`	`i = 4 and ExternalFlow::partialModel(api, _, _, _, _, result) // parameters`
`374`	`374`	`or`
`375`		`- i = 5 and result = "" // ext`
	`375`	`+ i = 5 and result = "" and exists(api) // ext`
`376`	`376`	`}`
`377`	`377`
`378`	`378`	`string partialNeutralModelRow(Callable api, int i) {`
Original file line number	Diff line number	Diff line change
`@@ -293,7 +293,7 @@ module ModelGeneratorInput implements ModelGeneratorInputSig<Location, JavaDataF`
`293`	`293`	`or`
`294`	`294`	`i = 4 and result = ExternalFlow::paramsString(api) // parameters`
`295`	`295`	`or`
`296`		`- i = 5 and result = "" // ext`
	`296`	`+ i = 5 and result = "" and exists(api) // ext`
`297`	`297`	`}`
`298`	`298`
`299`	`299`	`string partialNeutralModelRow(Callable api, int i) {`