Merge pull request #8364 from hvitved/ruby/fix-regex-parse

Ruby: Fix regex parsing of `/[|]/`

Author: hvitved

ruby/ql/consistency-queries/RegExpConsistency.ql

@@ -0,0 +1,8 @@
+import codeql.ruby.security.performance.RegExpTreeView
+
+query predicate nonUniqueChild(RegExpParent parent, int i, RegExpTerm child) {
+  child = parent.getChild(i) and
+  strictcount(parent.getChild(i)) > 1
+}
+
+query predicate cyclic(RegExpParent parent) { parent = parent.getAChild+() }

ruby/ql/lib/codeql/ruby/security/performance/ParseRegExp.qll

@@ -861,6 +861,7 @@ abstract class RegExp extends AST::StringlikeLiteral {
    * Whether the text in the range start,end is an alternation
    */
   predicate alternation(int start, int end) {
+    not this.inCharSet(start) and
     this.topLevel(start, end) and
     exists(int less | this.subalternation(start, less, _) and less < end)
   }

ruby/ql/lib/codeql/ruby/security/performance/RegExpTreeView.qll

@@ -69,7 +69,7 @@ class RegExpParent extends TRegExpParent {
 
   RegExpTerm getChild(int i) { none() }
 
-  RegExpTerm getAChild() { result = this.getChild(_) }
+  final RegExpTerm getAChild() { result = this.getChild(_) }
 
   int getNumChild() { result = count(this.getAChild()) }