diff --git a/java/ql/lib/semmle/code/java/security/regexp/NfaUtils.qll b/java/ql/lib/semmle/code/java/security/regexp/NfaUtils.qll index f24e3950d84..c781b8901d3 100644 --- a/java/ql/lib/semmle/code/java/security/regexp/NfaUtils.qll +++ b/java/ql/lib/semmle/code/java/security/regexp/NfaUtils.qll @@ -499,10 +499,10 @@ private module CharacterClasses { /** Gets a representative for all char classes that match the same chars as `c`. */ CharacterClass normalize(CharacterClass c) { exists(string normalization | - normalization = getMormalizationString(c) and + normalization = getNormalizationString(c) and result = min(CharacterClass cc, string raw | - getMormalizationString(cc) = normalization and cc = CharClass(raw) + getNormalizationString(cc) = normalization and cc = CharClass(raw) | cc order by raw ) @@ -510,7 +510,7 @@ private module CharacterClasses { } /** Gets a string representing all the chars matched by `c` */ - private string getMormalizationString(CharacterClass c) { + private string getNormalizationString(CharacterClass c) { (c instanceof PositiveCharacterClass or c instanceof PositiveCharacterClassEscape) and result = concat(string char | c.matches(char) and char = CharacterClasses::getARelevantChar()) or diff --git a/javascript/ql/lib/semmle/javascript/security/regexp/NfaUtils.qll b/javascript/ql/lib/semmle/javascript/security/regexp/NfaUtils.qll index f24e3950d84..c781b8901d3 100644 --- a/javascript/ql/lib/semmle/javascript/security/regexp/NfaUtils.qll +++ b/javascript/ql/lib/semmle/javascript/security/regexp/NfaUtils.qll @@ -499,10 +499,10 @@ private module CharacterClasses { /** Gets a representative for all char classes that match the same chars as `c`. */ CharacterClass normalize(CharacterClass c) { exists(string normalization | - normalization = getMormalizationString(c) and + normalization = getNormalizationString(c) and result = min(CharacterClass cc, string raw | - getMormalizationString(cc) = normalization and cc = CharClass(raw) + getNormalizationString(cc) = normalization and cc = CharClass(raw) | cc order by raw ) @@ -510,7 +510,7 @@ private module CharacterClasses { } /** Gets a string representing all the chars matched by `c` */ - private string getMormalizationString(CharacterClass c) { + private string getNormalizationString(CharacterClass c) { (c instanceof PositiveCharacterClass or c instanceof PositiveCharacterClassEscape) and result = concat(string char | c.matches(char) and char = CharacterClasses::getARelevantChar()) or diff --git a/python/ql/lib/semmle/python/security/regexp/NfaUtils.qll b/python/ql/lib/semmle/python/security/regexp/NfaUtils.qll index f24e3950d84..c781b8901d3 100644 --- a/python/ql/lib/semmle/python/security/regexp/NfaUtils.qll +++ b/python/ql/lib/semmle/python/security/regexp/NfaUtils.qll @@ -499,10 +499,10 @@ private module CharacterClasses { /** Gets a representative for all char classes that match the same chars as `c`. */ CharacterClass normalize(CharacterClass c) { exists(string normalization | - normalization = getMormalizationString(c) and + normalization = getNormalizationString(c) and result = min(CharacterClass cc, string raw | - getMormalizationString(cc) = normalization and cc = CharClass(raw) + getNormalizationString(cc) = normalization and cc = CharClass(raw) | cc order by raw ) @@ -510,7 +510,7 @@ private module CharacterClasses { } /** Gets a string representing all the chars matched by `c` */ - private string getMormalizationString(CharacterClass c) { + private string getNormalizationString(CharacterClass c) { (c instanceof PositiveCharacterClass or c instanceof PositiveCharacterClassEscape) and result = concat(string char | c.matches(char) and char = CharacterClasses::getARelevantChar()) or diff --git a/ruby/ql/lib/codeql/ruby/security/regexp/NfaUtils.qll b/ruby/ql/lib/codeql/ruby/security/regexp/NfaUtils.qll index f24e3950d84..c781b8901d3 100644 --- a/ruby/ql/lib/codeql/ruby/security/regexp/NfaUtils.qll +++ b/ruby/ql/lib/codeql/ruby/security/regexp/NfaUtils.qll @@ -499,10 +499,10 @@ private module CharacterClasses { /** Gets a representative for all char classes that match the same chars as `c`. */ CharacterClass normalize(CharacterClass c) { exists(string normalization | - normalization = getMormalizationString(c) and + normalization = getNormalizationString(c) and result = min(CharacterClass cc, string raw | - getMormalizationString(cc) = normalization and cc = CharClass(raw) + getNormalizationString(cc) = normalization and cc = CharClass(raw) | cc order by raw ) @@ -510,7 +510,7 @@ private module CharacterClasses { } /** Gets a string representing all the chars matched by `c` */ - private string getMormalizationString(CharacterClass c) { + private string getNormalizationString(CharacterClass c) { (c instanceof PositiveCharacterClass or c instanceof PositiveCharacterClassEscape) and result = concat(string char | c.matches(char) and char = CharacterClasses::getARelevantChar()) or