jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #387 from mcella/378

Browse Source 
Fixes #378: must acquire JID_CACHE_LOCK before adding to JID_CACHE
This commit is contained in:
Mike Taylor 2015-07-31 11:21:01 -04:00
commit 2c69144189
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sleekxmpp/jid.py
View File

@ -72,19 +72,18 @@ JID_CACHE_LOCK = threading.Lock()
JID_CACHE_MAX_SIZE = 1024 JID_CACHE_MAX_SIZE = 1024
def _cache(key, parts, locked): def _cache(key, parts, locked):
JID_CACHE[key] = (parts, locked) with JID_CACHE_LOCK:
if len(JID_CACHE) > JID_CACHE_MAX_SIZE: JID_CACHE[key] = (parts, locked)
with JID_CACHE_LOCK: while len(JID_CACHE) > JID_CACHE_MAX_SIZE:
while len(JID_CACHE) > JID_CACHE_MAX_SIZE: found = None
found = None for key, item in JID_CACHE.items():
for key, item in JID_CACHE.items(): if not item[1]: # if not locked
if not item[1]: # if not locked found = key
found = key
break
if not found: # more than MAX_SIZE locked
# warn?
break break
del JID_CACHE[found] if not found: # more than MAX_SIZE locked
# warn?
break
del JID_CACHE[found]
# pylint: disable=c0103 # pylint: disable=c0103
#: The nodeprep profile of stringprep used to validate the local, #: The nodeprep profile of stringprep used to validate the local,