hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-28 10:15:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ruby: Address review comments

Browse Source
This commit is contained in:
Tom Hvitved
2022-09-18 19:33:08 +02:00
parent 9004e82820
commit a8cc669251
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowDispatch.qll
View File

@@ -208,12 +208,12 @@ private predicate selfInModule(SelfVariable self, Module m) {
)
}
/** Holds if `self` belongs to a method inside module `m`. */
/** Holds if `self` belongs to method `method` inside module `m`. */
pragma[nomagic]
private predicate selfInMethod(SelfVariable self, Module m) {
exists(Scope scope, ModuleBase encl |
scope = self.getDeclaringScope() and
encl = scope.(MethodBase).getEnclosingModule() and
private predicate selfInMethod(SelfVariable self, MethodBase method, Module m) {
exists(ModuleBase encl |
method = self.getDeclaringScope() and
encl = method.getEnclosingModule() and
if encl instanceof SingletonClass
then m = encl.getEnclosingModule().getModule()
else m = encl.getModule()
@@ -354,7 +354,7 @@ private module Cached {
// end
// end
// ```
selfInMethod(sourceNode.(SsaSelfDefinitionNode).getVariable(), m)
selfInMethod(sourceNode.(SsaSelfDefinitionNode).getVariable(), _, m)
)
)
or
@@ -510,15 +510,17 @@ private DataFlow::Node trackInstance(Module tp, boolean exact, TypeTracker t) {
selfInModule(sourceNode.(SsaSelfDefinitionNode).getVariable(), tp)
or
// `self.new` inside a (singleton) method
selfInMethod(sourceNode.(SsaSelfDefinitionNode).getVariable(), tp)
selfInMethod(sourceNode.(SsaSelfDefinitionNode).getVariable(), _, tp)
)
or
// `self` reference in method or top-level (but not in module, where instance
// methods cannot be called; only singleton methods)
result =
any(SsaSelfDefinitionNode self |
selfInMethod(self.getVariable(), tp) and
exact = false
exists(MethodBase m |
selfInMethod(self.getVariable(), m, tp) and
if m.getEnclosingModule() instanceof Toplevel then exact = true else exact = false
)
or
selfInToplevel(self.getVariable(), tp) and
exact = true
@@ -535,7 +537,7 @@ private DataFlow::Node trackInstance(Module tp, boolean exact, TypeTracker t) {
selfInModule(result.(SsaSelfDefinitionNode).getVariable(), m)
or
// needed for e.g. `self.puts`
selfInMethod(result.(SsaSelfDefinitionNode).getVariable(), m)
selfInMethod(result.(SsaSelfDefinitionNode).getVariable(), any(SingletonMethod sm), m)
)
or
// `in C => c then c.foo`

2
ruby/ql/test/library-tests/modules/callgraph.expected
View File

@@ -11,7 +11,6 @@ getTarget
| calls.rb:28:5:28:15 | call to singleton_m | calls.rb:23:5:23:29 | singleton_m |
| calls.rb:29:5:29:20 | call to singleton_m | calls.rb:23:5:23:29 | singleton_m |
| calls.rb:33:1:33:13 | call to singleton_m | calls.rb:23:5:23:29 | singleton_m |
| calls.rb:36:5:36:14 | call to instance_m | calls.rb:22:5:22:23 | instance_m |
| calls.rb:40:5:40:13 | call to include | calls.rb:103:5:103:20 | include |
| calls.rb:48:9:48:18 | call to instance_m | calls.rb:22:5:22:23 | instance_m |
| calls.rb:49:9:49:23 | call to instance_m | calls.rb:22:5:22:23 | instance_m |
@@ -178,6 +177,7 @@ unresolvedCall
| calls.rb:25:5:25:14 | call to instance_m |
| calls.rb:26:5:26:19 | call to instance_m |
| calls.rb:32:1:32:12 | call to instance_m |
| calls.rb:36:5:36:14 | call to instance_m |
| calls.rb:41:5:41:14 | call to instance_m |
| calls.rb:42:5:42:19 | call to instance_m |
| calls.rb:44:5:44:15 | call to singleton_m |