Skip to content

Commit 0373754

Browse files
erik-krogherik-krogh
authored
Merge pull request github#11403 from erik-krogh/additional
ReDoS: add missing additional keywords
2 parents adf905d + 95f3519 commit 0373754

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

‎java/ql/lib/semmle/code/java/regex/RegexTreeView.qll‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ module Impl implements RegexTreeViewSig {
615615
* \p{Digit}
616616
* \p{IsLowerCase}
617617
*/
618-
class RegExpNamedProperty extends RegExpCharacterClassEscape {
618+
additional class RegExpNamedProperty extends RegExpCharacterClassEscape {
619619
boolean inverted;
620620
string name;
621621

@@ -745,7 +745,7 @@ module Impl implements RegexTreeViewSig {
745745
* \t
746746
* ```
747747
*/
748-
class RegExpNormalChar extends RegExpTerm, TRegExpNormalChar {
748+
additional class RegExpNormalChar extends RegExpTerm, TRegExpNormalChar {
749749
RegExpNormalChar() { this = TRegExpNormalChar(re, start, end) }
750750

751751
/**
@@ -770,7 +770,7 @@ module Impl implements RegexTreeViewSig {
770770
* \Qabc\E
771771
* ```
772772
*/
773-
class RegExpQuote extends RegExpTerm, TRegExpQuote {
773+
additional class RegExpQuote extends RegExpTerm, TRegExpQuote {
774774
string value;
775775

776776
RegExpQuote() {
@@ -880,7 +880,7 @@ module Impl implements RegexTreeViewSig {
880880
* .
881881
* ```
882882
*/
883-
class RegExpSpecialChar extends RegExpTerm, TRegExpSpecialChar {
883+
additional class RegExpSpecialChar extends RegExpTerm, TRegExpSpecialChar {
884884
string char;
885885

886886
RegExpSpecialChar() {
@@ -956,7 +956,7 @@ module Impl implements RegexTreeViewSig {
956956
* (?=\w)
957957
* ```
958958
*/
959-
class RegExpZeroWidthMatch extends RegExpGroup {
959+
additional class RegExpZeroWidthMatch extends RegExpGroup {
960960
RegExpZeroWidthMatch() { re.zeroWidthMatch(start, end) }
961961

962962
override RegExpTerm getChild(int i) { none() }
@@ -1023,7 +1023,7 @@ module Impl implements RegexTreeViewSig {
10231023
* (?!\n)
10241024
* ```
10251025
*/
1026-
class RegExpNegativeLookahead extends RegExpLookahead {
1026+
additional class RegExpNegativeLookahead extends RegExpLookahead {
10271027
RegExpNegativeLookahead() { re.negativeLookaheadAssertionGroup(start, end) }
10281028

10291029
override string getPrimaryQLClass() { result = "RegExpNegativeLookahead" }
@@ -1065,7 +1065,7 @@ module Impl implements RegexTreeViewSig {
10651065
* (?<!\\)
10661066
* ```
10671067
*/
1068-
class RegExpNegativeLookbehind extends RegExpLookbehind {
1068+
additional class RegExpNegativeLookbehind extends RegExpLookbehind {
10691069
RegExpNegativeLookbehind() { re.negativeLookbehindAssertionGroup(start, end) }
10701070

10711071
override string getPrimaryQLClass() { result = "RegExpNegativeLookbehind" }
@@ -1159,7 +1159,7 @@ module Impl implements RegexTreeViewSig {
11591159
/**
11601160
* Gets the flags for `root`, or the empty string if `root` has no flags.
11611161
*/
1162-
deprecated string getFlags(RegExpTerm root) {
1162+
additional deprecated string getFlags(RegExpTerm root) {
11631163
root.isRootTerm() and
11641164
result = root.getLiteral().getFlags()
11651165
}

‎python/ql/lib/semmle/python/RegexTreeView.qll‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ module Impl implements RegexTreeViewSig {
454454
override string getPrimaryQLClass() { result = "RegExpAlt" }
455455
}
456456

457-
class RegExpCharEscape = RegExpEscape;
457+
additional class RegExpCharEscape = RegExpEscape;
458458

459459
/**
460460
* An escaped regular expression term, that is, a regular expression
@@ -684,7 +684,7 @@ module Impl implements RegexTreeViewSig {
684684
* \t
685685
* ```
686686
*/
687-
class RegExpNormalChar extends RegExpTerm, TRegExpNormalChar {
687+
additional class RegExpNormalChar extends RegExpTerm, TRegExpNormalChar {
688688
RegExpNormalChar() { this = TRegExpNormalChar(re, start, end) }
689689

690690
/**
@@ -792,7 +792,7 @@ module Impl implements RegexTreeViewSig {
792792
* .
793793
* ```
794794
*/
795-
class RegExpSpecialChar extends RegExpTerm, TRegExpSpecialChar {
795+
additional class RegExpSpecialChar extends RegExpTerm, TRegExpSpecialChar {
796796
string char;
797797

798798
RegExpSpecialChar() {
@@ -868,7 +868,7 @@ module Impl implements RegexTreeViewSig {
868868
* (?=\w)
869869
* ```
870870
*/
871-
class RegExpZeroWidthMatch extends RegExpGroup {
871+
additional class RegExpZeroWidthMatch extends RegExpGroup {
872872
RegExpZeroWidthMatch() { re.zeroWidthMatch(start, end) }
873873

874874
override RegExpTerm getChild(int i) { none() }
@@ -937,7 +937,7 @@ module Impl implements RegexTreeViewSig {
937937
* (?!\n)
938938
* ```
939939
*/
940-
class RegExpNegativeLookahead extends RegExpLookahead {
940+
additional class RegExpNegativeLookahead extends RegExpLookahead {
941941
RegExpNegativeLookahead() { re.negativeLookaheadAssertionGroup(start, end) }
942942

943943
override string getPrimaryQLClass() { result = "RegExpNegativeLookahead" }
@@ -979,7 +979,7 @@ module Impl implements RegexTreeViewSig {
979979
* (?<!\\)
980980
* ```
981981
*/
982-
class RegExpNegativeLookbehind extends RegExpLookbehind {
982+
additional class RegExpNegativeLookbehind extends RegExpLookbehind {
983983
RegExpNegativeLookbehind() { re.negativeLookbehindAssertionGroup(start, end) }
984984

985985
override string getPrimaryQLClass() { result = "RegExpNegativeLookbehind" }

‎ruby/ql/lib/codeql/ruby/regexp/RegExpTreeView.qll‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -539,7 +539,7 @@ private module Impl implements RegexTreeViewSig {
539539
override predicate isNullable() { this.getAChild().isNullable() }
540540
}
541541

542-
class RegExpCharEscape = RegExpEscape;
542+
additional class RegExpCharEscape = RegExpEscape;
543543

544544
/**
545545
* An escaped regular expression term, that is, a regular expression
@@ -620,7 +620,7 @@ private module Impl implements RegexTreeViewSig {
620620
/**
621621
* A non-word boundary, that is, a regular expression term of the form `\B`.
622622
*/
623-
class RegExpNonWordBoundary extends RegExpSpecialChar {
623+
additional class RegExpNonWordBoundary extends RegExpSpecialChar {
624624
RegExpNonWordBoundary() { this.getChar() = "\\B" }
625625

626626
override string getAPrimaryQlClass() { result = "RegExpNonWordBoundary" }
@@ -756,7 +756,7 @@ private module Impl implements RegexTreeViewSig {
756756
* \t
757757
* ```
758758
*/
759-
class RegExpNormalChar extends RegExpTerm, TRegExpNormalChar {
759+
additional class RegExpNormalChar extends RegExpTerm, TRegExpNormalChar {
760760
RegExpNormalChar() { this = TRegExpNormalChar(re, start, end) }
761761

762762
/**
@@ -878,7 +878,7 @@ private module Impl implements RegexTreeViewSig {
878878
* .
879879
* ```
880880
*/
881-
class RegExpSpecialChar extends RegExpTerm, TRegExpSpecialChar {
881+
additional class RegExpSpecialChar extends RegExpTerm, TRegExpSpecialChar {
882882
string char;
883883

884884
RegExpSpecialChar() {
@@ -926,7 +926,7 @@ private module Impl implements RegexTreeViewSig {
926926
* \A
927927
* ```
928928
*/
929-
class RegExpAnchor extends RegExpSpecialChar {
929+
additional class RegExpAnchor extends RegExpSpecialChar {
930930
RegExpAnchor() { this.getChar() = ["^", "$", "\\A", "\\Z", "\\z"] }
931931

932932
override string getAPrimaryQlClass() { result = "RegExpAnchor" }
@@ -975,7 +975,7 @@ private module Impl implements RegexTreeViewSig {
975975
* (?=\w)
976976
* ```
977977
*/
978-
class RegExpZeroWidthMatch extends RegExpGroup {
978+
additional class RegExpZeroWidthMatch extends RegExpGroup {
979979
RegExpZeroWidthMatch() { re.zeroWidthMatch(start, end) }
980980

981981
override RegExpTerm getChild(int i) { none() }
@@ -1050,7 +1050,7 @@ private module Impl implements RegexTreeViewSig {
10501050
* (?!\n)
10511051
* ```
10521052
*/
1053-
class RegExpNegativeLookahead extends RegExpLookahead {
1053+
additional class RegExpNegativeLookahead extends RegExpLookahead {
10541054
RegExpNegativeLookahead() { re.negativeLookaheadAssertionGroup(start, end) }
10551055

10561056
override string getAPrimaryQlClass() { result = "RegExpNegativeLookahead" }
@@ -1092,7 +1092,7 @@ private module Impl implements RegexTreeViewSig {
10921092
* (?<!\\)
10931093
* ```
10941094
*/
1095-
class RegExpNegativeLookbehind extends RegExpLookbehind {
1095+
additional class RegExpNegativeLookbehind extends RegExpLookbehind {
10961096
RegExpNegativeLookbehind() { re.negativeLookbehindAssertionGroup(start, end) }
10971097

10981098
override string getAPrimaryQlClass() { result = "RegExpNegativeLookbehind" }
@@ -1142,7 +1142,7 @@ private module Impl implements RegexTreeViewSig {
11421142
* A named character property. For example, the POSIX bracket expression
11431143
* `[[:digit:]]`.
11441144
*/
1145-
class RegExpNamedCharacterProperty extends RegExpTerm, TRegExpNamedCharacterProperty {
1145+
additional class RegExpNamedCharacterProperty extends RegExpTerm, TRegExpNamedCharacterProperty {
11461146
RegExpNamedCharacterProperty() { this = TRegExpNamedCharacterProperty(re, start, end) }
11471147

11481148
override RegExpTerm getChild(int i) { none() }

0 commit comments

Comments
 (0)