Merge pull request #20327 from michaelnebel/go/ql4ql

michaelnebel · web-flow · commit 9a88e38d6f25 · 2025-09-02T11:45:26.000+02:00
Go: Fix some Ql4Ql violations.
diff --git a/go/ql/lib/semmle/go/StringOps.qll b/go/ql/lib/semmle/go/StringOps.qll
@@ -306,11 +306,12 @@ module StringOps {
      */
     class StringFormatCall extends DataFlow::CallNode {
       string fmt;
-      Range f;
 
       StringFormatCall() {
-        this = f.getACall() and
-        fmt = this.getArgument(f.getFormatStringIndex()).getStringValue() and
+        exists(Range f |
+          this = f.getACall() and
+          fmt = this.getArgument(f.getFormatStringIndex()).getStringValue()
+        ) and
         fmt.regexpMatch(getFormatComponentRegex() + "*")
       }
 
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
@@ -367,7 +367,7 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
   }
 
   /**
-   * Holds if `guard` marks a point in the control-flow graph where this node
+   * Holds if `guard` marks a point in the control-flow graph where `g`
    * is known to validate `nd`, which is represented by `ap`.
    *
    * This predicate exists to enforce a good join order in `getAGuardedNode`.
@@ -378,7 +378,7 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
   }
 
   /**
-   * Holds if `guard` marks a point in the control-flow graph where this node
+   * Holds if `guard` marks a point in the control-flow graph where `g`
    * is known to validate `nd`.
    */
   private predicate guards(Node g, ControlFlow::ConditionGuardNode guard, Node nd) {
diff --git a/go/ql/src/experimental/IntegerOverflow/RangeAnalysis.qll b/go/ql/src/experimental/IntegerOverflow/RangeAnalysis.qll

Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {`
`367`	`367`	`}`
`368`	`368`
`369`	`369`	`/**`
`370`		- * Holds if `guard` marks a point in the control-flow graph where this node
	`370`	+ * Holds if `guard` marks a point in the control-flow graph where `g`
`371`	`371`	* is known to validate `nd`, which is represented by `ap`.
`372`	`372`	`*`
`373`	`373`	* This predicate exists to enforce a good join order in `getAGuardedNode`.
`@@ -378,7 +378,7 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {`
`378`	`378`	`}`
`379`	`379`
`380`	`380`	`/**`
`381`		- * Holds if `guard` marks a point in the control-flow graph where this node
	`381`	+ * Holds if `guard` marks a point in the control-flow graph where `g`
`382`	`382`	* is known to validate `nd`.
`383`	`383`	`*/`
`384`	`384`	`private predicate guards(Node g, ControlFlow::ConditionGuardNode guard, Node nd) {`