tests: bump to master (#32)

editorconfig · Dec 7, 2020 · b107472 · b107472
1 parent 404d7c0
commit b107472
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/editorconfig/fnmatch.py b/editorconfig/fnmatch.py
@@ -135,7 +135,7 @@ def translate(pat, nested=False):
             else:
                 result += '[^/]*'
         elif current_char == '?':
-            result += '.'
+            result += '[^/]'
         elif current_char == '[':
             if in_brackets:
                 result += '\\['
@@ -148,8 +148,8 @@ def translate(pat, nested=False):
                         break
                     pos += 1
                 if has_slash:
-                    result += '\\[' + pat[index:(pos + 1)] + '\\]'
-                    index = pos + 2
+                    result += '\\[' + pat[index:(pos + 1)]
+                    index = pos + 1
                 else:
                     if index < length and pat[index] in '!^':
                         index += 1
@@ -163,8 +163,11 @@ def translate(pat, nested=False):
             else:
                 result += '\\' + current_char
         elif current_char == ']':
-            result += current_char
-            in_brackets = False
+            if in_brackets and pat[index-2] == '\\':
+                result += '\\]'
+            else:
+                result += current_char
+                in_brackets = False
         elif current_char == '{':
             pos = index
             has_comma = False

diff --git a/editorconfig/ini.py b/editorconfig/ini.py
@@ -27,6 +27,10 @@
 
 __all__ = ["ParsingError", "EditorConfigParser"]
 
+MAX_SECTION_LENGTH = 4096
+MAX_PROPERTY_LENGTH= 50
+MAX_VALUE_LENGTH = 255
+
 
 class EditorConfigParser(object):
 
@@ -134,6 +138,8 @@ def _read(self, fp, fpname):
                 mo = self.SECTCRE.match(line)
                 if mo:
                     sectname = mo.group('header')
+                    if len(sectname) > MAX_SECTION_LENGTH:
+                        continue
                     in_section = True
                     matching_section = self.matches_filename(fpname, sectname)
                     # So sections can't start with a continuation line
@@ -154,6 +160,9 @@ def _read(self, fp, fpname):
                         if optval == '""':
                             optval = ''
                         optname = self.optionxform(optname.rstrip())
+                        if (len(optname) > MAX_PROPERTY_LENGTH or
+                            len(optval) > MAX_VALUE_LENGTH):
+                            continue
                         if not in_section and optname == 'root':
                             self.root_file = (optval.lower() == 'true')
                         if matching_section:

diff --git a/tests b/tests
+2 −2		.editorconfig
+8 −0		.gitignore
+71 −11		CMakeLists.txt
+23 −0		LICENSE.txt
+19 −18		cli/CMakeLists.txt
+44 −0		cmake/almostcat.cmake
+70 −0		cmake/ec_sort.cmake
+132 −0		cmake/runandsort.cmake
+34 −10		filetree/CMakeLists.txt
+4 −4		filetree/path_separator.in
+4 −0		filetree/path_with_special_[chars/path_with_special_chars.in
+3 −0		filetree/root_file.in
+1 −0		filetree/root_mixed/root_file.in
+22 −0		filetree/unset.in
+21 −0		filetree/unset/unset.in
+27 −18		glob/CMakeLists.txt
+4 −0		glob/brackets.in
+3 −0		glob/star.in
+47 −0		meta/CMakeLists.txt
+2 −0		meta/meta.in
+31 −0		meta/sample.cmake
+7 −0		meta/sample.txt
+33 −59		parser/CMakeLists.txt
+3 −16		parser/comments.in
+4 −0		parser/comments_and_newlines.in
+1 −0		parser/comments_only.in
+0 −0		parser/empty.in
+15 −0		parser/limits.in
+2 −0		parser/newlines_only.in
+0 −20		parser/whitespace.in
+17 −17		properties/CMakeLists.txt