From 179281dfed46f26d3fcc76d0600ee6728a7e493c Mon Sep 17 00:00:00 2001

From: Lumir Balhar <lbalhar@redhat.com>

Date: Thu, 22 Apr 2021 13:39:00 +0200

Subject: [PATCH] CVE-2021-27291

---

 pygments/lexers/archetype.py | 2 +-

 pygments/lexers/factor.py    | 4 ++--

 pygments/lexers/jvm.py       | 1 -

 pygments/lexers/matlab.py    | 6 +++---

 pygments/lexers/objective.py | 4 ++--

 pygments/lexers/templates.py | 2 +-

 pygments/lexers/varnish.py   | 2 +-

 7 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pygments/lexers/archetype.py b/pygments/lexers/archetype.py

index 5d4eb9a..82f3b12 100644

--- a/pygments/lexers/archetype.py

+++ b/pygments/lexers/archetype.py

@@ -58,7 +58,7 @@ class AtomsLexer(RegexLexer):

             (r'P((\d*(\.\d+)?[YyMmWwDd]){1,3}(T(\d*(\.\d+)?[HhMmSs]){,3})?|'

              r'T(\d*(\.\d+)?[HhMmSs]){,3})', Literal.Date),

             (r'[+-]?(\d+\.\d*|\.\d+|\d+)[eE][+-]?\d+', Number.Float),

-            (r'[+-]?(\d+)*\.\d+%?', Number.Float),

+            (r'[+-]?\d*\.\d+%?', Number.Float),

             (r'0x[0-9a-fA-F]+', Number.Hex),

             (r'[+-]?\d+%?', Number.Integer),

         ],

diff --git a/pygments/lexers/factor.py b/pygments/lexers/factor.py

index 09d85c2..7eb3993 100644

--- a/pygments/lexers/factor.py

+++ b/pygments/lexers/factor.py

@@ -265,7 +265,7 @@ class FactorLexer(RegexLexer):

             (r'(?:<PRIVATE|PRIVATE>)\s', Keyword.Namespace),

             # strings

-            (r'"""\s+(?:.|\n)*?\s+"""', String),

+            (r'"""\s(?:.|\n)*?\s"""', String),

             (r'"(?:\\\\|\\"|[^"])*"', String),

             (r'\S+"\s+(?:\\\\|\\"|[^"])*"', String),

             (r'CHAR:\s+(?:\\[\\abfnrstv]|[^\\]\S*)\s', String.Char),

@@ -322,7 +322,7 @@ class FactorLexer(RegexLexer):

         'slots': [

             (r'\s+', Text),

             (r';\s', Keyword, '#pop'),

-            (r'(\{\s+)(\S+)(\s+[^}]+\s+\}\s)',

+            (r'(\{\s+)(\S+)(\s[^}]+\s\}\s)',

              bygroups(Text, Name.Variable, Text)),

             (r'\S+', Name.Variable),

         ],

diff --git a/pygments/lexers/jvm.py b/pygments/lexers/jvm.py

index f439283..668eed7 100644

--- a/pygments/lexers/jvm.py

+++ b/pygments/lexers/jvm.py

@@ -963,7 +963,6 @@ class CeylonLexer(RegexLexer):

             (r'(import)(\s+)', bygroups(Keyword.Namespace, Text), 'import'),

             (r'"(\\\\|\\"|[^"])*"', String),

             (r"'\\.'|'[^\\]'|'\\\{#[0-9a-fA-F]{4}\}'", String.Char),

-            (r'".*``.*``.*"', String.Interpol),

             (r'(\.)([a-z_]\w*)',

              bygroups(Operator, Name.Attribute)),

             (r'[a-zA-Z_]\w*:', Name.Label),

diff --git a/pygments/lexers/matlab.py b/pygments/lexers/matlab.py

index 56a0f6d..abfb9f0 100644

--- a/pygments/lexers/matlab.py

+++ b/pygments/lexers/matlab.py

@@ -124,7 +124,7 @@ class MatlabLexer(RegexLexer):

             (r'.', Comment.Multiline),

         ],

         'deffunc': [

-            (r'(\s*)(?:(.+)(\s*)(=)(\s*))?(.+)(\()(.*)(\))(\s*)',

+            (r'(\s*)(?:(\S+)(\s*)(=)(\s*))?(.+)(\()(.*)(\))(\s*)',

              bygroups(Whitespace, Text, Whitespace, Punctuation,

                       Whitespace, Name.Function, Punctuation, Text,

                       Punctuation, Whitespace), '#pop'),

@@ -585,7 +585,7 @@ class OctaveLexer(RegexLexer):

             (r"[^']*'", String, '#pop'),

         ],

         'deffunc': [

-            (r'(\s*)(?:(.+)(\s*)(=)(\s*))?(.+)(\()(.*)(\))(\s*)',

+            (r'(\s*)(?:(\S+)(\s*)(=)(\s*))?(.+)(\()(.*)(\))(\s*)',

              bygroups(Whitespace, Text, Whitespace, Punctuation,

                       Whitespace, Name.Function, Punctuation, Text,

                       Punctuation, Whitespace), '#pop'),

@@ -653,7 +653,7 @@ class ScilabLexer(RegexLexer):

             (r'.', String, '#pop'),

         ],

         'deffunc': [

-            (r'(\s*)(?:(.+)(\s*)(=)(\s*))?(.+)(\()(.*)(\))(\s*)',

+            (r'(\s*)(?:(\S+)(\s*)(=)(\s*))?(.+)(\()(.*)(\))(\s*)',

              bygroups(Whitespace, Text, Whitespace, Punctuation,

                       Whitespace, Name.Function, Punctuation, Text,

                       Punctuation, Whitespace), '#pop'),

diff --git a/pygments/lexers/objective.py b/pygments/lexers/objective.py

index 7807255..e4b9f1e 100644

--- a/pygments/lexers/objective.py

+++ b/pygments/lexers/objective.py

@@ -261,11 +261,11 @@ class LogosLexer(ObjectiveCppLexer):

              'logos_classname'),

             (r'(%hook|%group)(\s+)([a-zA-Z$_][\w$]+)',

              bygroups(Keyword, Text, Name.Class)),

-            (r'(%config)(\s*\(\s*)(\w+)(\s*=\s*)(.*?)(\s*\)\s*)',

+            (r'(%config)(\s*\(\s*)(\w+)(\s*=)(.*?)(\)\s*)',

              bygroups(Keyword, Text, Name.Variable, Text, String, Text)),

             (r'(%ctor)(\s*)(\{)', bygroups(Keyword, Text, Punctuation),

              'function'),

-            (r'(%new)(\s*)(\()(\s*.*?\s*)(\))',

+            (r'(%new)(\s*)(\()(.*?)(\))',

              bygroups(Keyword, Text, Keyword, String, Keyword)),

             (r'(\s*)(%end)(\s*)', bygroups(Text, Keyword, Text)),

             inherit,

diff --git a/pygments/lexers/templates.py b/pygments/lexers/templates.py

index 83c57db..066dad7 100644

--- a/pygments/lexers/templates.py

+++ b/pygments/lexers/templates.py

@@ -1428,7 +1428,7 @@ class EvoqueLexer(RegexLexer):

             # see doc for handling first name arg: /directives/evoque/

             # + minor inconsistency: the "name" in e.g. $overlay{name=site_base}

             # should be using(PythonLexer), not passed out as String

-            (r'(\$)(evoque|overlay)(\{(%)?)(\s*[#\w\-"\'.]+[^=,%}]+?)?'

+            (r'(\$)(evoque|overlay)(\{(%)?)(\s*[#\w\-"\'.]+)?'

              r'(.*?)((?(4)%)\})',

              bygroups(Punctuation, Name.Builtin, Punctuation, None,

                       String, using(PythonLexer), Punctuation)),

diff --git a/pygments/lexers/varnish.py b/pygments/lexers/varnish.py

index 4452142..f4c9a88 100644

--- a/pygments/lexers/varnish.py

+++ b/pygments/lexers/varnish.py

@@ -61,7 +61,7 @@ class VCLLexer(RegexLexer):

              bygroups(Name.Attribute, Operator, Name.Variable.Global, Punctuation)),

             (r'(\.probe)(\s*=\s*)(\{)',

              bygroups(Name.Attribute, Operator, Punctuation), 'probe'),

-            (r'(\.\w+\b)(\s*=\s*)([^;]*)(\s*;)',

+            (r'(\.\w+\b)(\s*=\s*)([^;\s]*)(\s*;)',

              bygroups(Name.Attribute, Operator, using(this), Punctuation)),

             (r'\{', Punctuation, '#push'),

             (r'\}', Punctuation, '#pop'),

-- 

2.30.2