bpo-41715: Fix potential catastrofic backtracking in c_analyzer. (pythonGH-22091)

serhiy-storchaka · web-flow · commit dcfaa520c463 · 2020-09-17T10:34:20.000+03:00
diff --git a/Tools/c-analyzer/c_analyzer/common/info.py b/Tools/c-analyzer/c_analyzer/common/info.py
@@ -9,7 +9,8 @@
 
 UNKNOWN = '???'
 
-NAME_RE = re.compile(r'^([a-zA-Z]|_\w*[a-zA-Z]\w*|[a-zA-Z]\w*)$')
+# Does not start with digit and contains at least one letter.
+NAME_RE = re.compile(r'(?!\d)(?=.*?[A-Za-z])\w+', re.ASCII)
 
 
 class ID(_NTBase, namedtuple('ID', 'filename funcname name')):
@@ -50,17 +51,16 @@ def validate(self):
         """Fail if the object is invalid (i.e. init with bad data)."""
         if not self.name:
             raise TypeError('missing name')
-        else:
-            if not NAME_RE.match(self.name):
-                raise ValueError(
-                        f'name must be an identifier, got {self.name!r}')
+        if not NAME_RE.fullmatch(self.name):
+            raise ValueError(
+                    f'name must be an identifier, got {self.name!r}')
 
         # Symbols from a binary might not have filename/funcname info.
 
         if self.funcname:
             if not self.filename:
                 raise TypeError('missing filename')
-            if not NAME_RE.match(self.funcname) and self.funcname != UNKNOWN:
+            if not NAME_RE.fullmatch(self.funcname) and self.funcname != UNKNOWN:
                 raise ValueError(
                         f'name must be an identifier, got {self.funcname!r}')
 
