Kotlin: Fix CFG for string templates

igfoo · igfoo · commit 2e5cf92f8a66 · 2022-05-10T19:51:06.000+01:00
diff --git a/java/ql/lib/semmle/code/java/ControlFlowGraph.qll b/java/ql/lib/semmle/code/java/ControlFlowGraph.qll
@@ -459,6 +459,8 @@ private module ControlFlowGraphImpl {
       this instanceof LocalVariableDeclExpr and
       not this = any(InstanceOfExpr ioe).getLocalVariableDeclExpr()
       or
+      this instanceof StringTemplateExpr
+      or
       this instanceof RValue
       or
       this instanceof Call // includes both expressions and statements
@@ -548,6 +550,10 @@ private module ControlFlowGraphImpl {
         result = e.getArgument(index)
       )
       or
+      exists(StringTemplateExpr e | e = this |
+        result = e.getComponent(index)
+      )
+      or
       index = 0 and result = this.(ReturnStmt).getResult()
       or
       index = 0 and result = this.(ThrowStmt).getExpr()
