From ead883a366b90df45de02c527e88b5200ad04f81 Mon Sep 17 00:00:00 2001 From: "R. David Murray" Date: Fri, 9 Jul 2010 13:16:26 +0000 Subject: [PATCH] Merged revisions 82730-82731 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r82730 | r.david.murray | 2010-07-09 08:23:21 -0400 (Fri, 09 Jul 2010) | 4 lines 7846: limit fnmatch pattern cache to _MAXCACHE=100 entries. Patch by Andrew Clegg. ........ r82731 | r.david.murray | 2010-07-09 09:14:03 -0400 (Fri, 09 Jul 2010) | 2 lines Fix sort order mistake in Misc/ACKS. ........ --- Lib/fnmatch.py | 3 +++ Lib/test/test_fnmatch.py | 17 ++++++++++++++++- Misc/ACKS | 1 + Misc/NEWS | 2 ++ 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/Lib/fnmatch.py b/Lib/fnmatch.py index 30c0a922f2..26ae4ccb14 100644 --- a/Lib/fnmatch.py +++ b/Lib/fnmatch.py @@ -16,6 +16,7 @@ __all__ = ["filter", "fnmatch","fnmatchcase","translate"] _cache = {} # Maps text patterns to compiled regexen. _cacheb = {} # Ditto for bytes patterns. +_MAXCACHE = 100 # Maximum size of caches def fnmatch(name, pat): """Test whether FILENAME matches PATTERN. @@ -48,6 +49,8 @@ def _compile_pattern(pat): res = bytes(res_str, 'ISO-8859-1') else: res = translate(pat) + if len(cache) >= _MAXCACHE: + cache.clear() cache[pat] = regex = re.compile(res) return regex.match diff --git a/Lib/test/test_fnmatch.py b/Lib/test/test_fnmatch.py index 506c67999c..f2966ad724 100644 --- a/Lib/test/test_fnmatch.py +++ b/Lib/test/test_fnmatch.py @@ -3,7 +3,7 @@ from test import support import unittest -from fnmatch import fnmatch, fnmatchcase +from fnmatch import fnmatch, fnmatchcase, _MAXCACHE, _cache, _cacheb class FnmatchTestCase(unittest.TestCase): @@ -55,6 +55,21 @@ class FnmatchTestCase(unittest.TestCase): self.check_match(b'test\xff', b'te*\xff') self.check_match(b'foo\nbar', b'foo*') + def test_cache_clearing(self): + # check that caches do not grow too large + # http://bugs.python.org/issue7846 + + # string pattern cache + for i in range(_MAXCACHE + 1): + fnmatch('foo', '?' * i) + + self.assertLessEqual(len(_cache), _MAXCACHE) + + # bytes pattern cache + for i in range(_MAXCACHE + 1): + fnmatch(b'foo', b'?' * i) + self.assertLessEqual(len(_cacheb), _MAXCACHE) + def test_main(): support.run_unittest(FnmatchTestCase) diff --git a/Misc/ACKS b/Misc/ACKS index 97d5475756..02f571a319 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -137,6 +137,7 @@ Tom Christiansen Vadim Chugunov David Cinege Mike Clarkson +Andrew Clegg Brad Clements Steve Clift Nick Coghlan diff --git a/Misc/NEWS b/Misc/NEWS index f35860229b..6296eef6ec 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -75,6 +75,8 @@ C-API Library ------- +- Issue #7646: The fnmatch pattern cache no longer grows without bound. + - Issue #9136: Fix 'dictionary changed size during iteration' RuntimeError produced when profiling the decimal module. This was due to a dangerous iteration over 'locals()' in Context.__init__. -- 2.40.0