Use arg position instead of arg as class field to reduce number of in…

…stances
github · Jan 10, 2024 · ea21829 · ea21829
1 parent 78c0cdf
commit ea21829
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/go/ql/lib/semmle/go/frameworks/stdlib/Log.qll b/go/ql/lib/semmle/go/frameworks/stdlib/Log.qll
@@ -27,19 +27,21 @@ module Log {
   }
 
   private class LogCall extends LoggerCall::Range, DataFlow::CallNode {
-    DataFlow::Node messageComponent;
+    int firstPrintedArg;
 
     LogCall() {
       exists(Function f | this = f.getACall() |
         f instanceof LogFunction and
-        messageComponent = this.getASyntacticArgument()
+        firstPrintedArg = 0
         or
         f instanceof LogOutput and
-        messageComponent = this.getSyntacticArgument(1)
+        firstPrintedArg = 1
       )
     }
 
-    override DataFlow::Node getAMessageComponent() { result = messageComponent }
+    override DataFlow::Node getAMessageComponent() {
+      result = this.getSyntacticArgument(any(int i | i >= firstPrintedArg))
+    }
   }
 
   /** A fatal log function, which calls `os.Exit`. */