Swift: Suggestions from review.

github · Aug 23, 2023 · 46fc1fd · 46fc1fd
1 parent 15c49ee
commit 46fc1fd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/swift/ql/lib/codeql/swift/regex/Regex.qll b/swift/ql/lib/codeql/swift/regex/Regex.qll
@@ -34,9 +34,7 @@ abstract class RegexPatternSource extends DataFlow::Node {
  * a `Regex`. This is a simple wrapper to make that happen.
  */
 private class RegexFromRegexPatternSource extends RegExp {
-  RegexPatternSource node;
-
-  RegexFromRegexPatternSource() { this = node.asExpr() }
+  RegexFromRegexPatternSource() { this = any(RegexPatternSource node).asExpr() }
 }
 
 /**

diff --git a/swift/ql/lib/codeql/swift/security/regex/HostnameRegex.qll b/swift/ql/lib/codeql/swift/security/regex/HostnameRegex.qll
@@ -12,7 +12,7 @@ private import codeql.regex.HostnameRegexp as Shared
 /**
  * An implementation of the signature that allows the Hostname analysis to run.
  */
-module Impl implements Shared::HostnameRegexpSig<TreeImpl> {
+private module Impl implements Shared::HostnameRegexpSig<TreeImpl> {
   class DataFlowNode = DataFlow::Node;
 
   class RegExpPatternSource = Regex::RegexPatternSource;