Unverified Commit d9741cf7 authored by Isis Lovecruft's avatar Isis Lovecruft
Browse files

Merge branch 'fix/26023' into develop

parents 37e126f3 35772f8b
......@@ -161,7 +161,19 @@ def parseServerDescriptorsFile(filename, validate=True):
logging.info("Parsing server descriptors with Stem: %s" % filename)
descriptorType = 'server-descriptor 1.0'
document = parse_file(filename, descriptorType, validate=validate)
routers = list(document)
routers = list()
# Work around https://bugs.torproject.org/26023 by parsing each descriptor
# at a time and catching any errors not handled in stem:
while True:
try:
routers.append(document.next())
except StopIteration:
break
except Exception as error:
logging.debug("Error while parsing a bridge server descriptor: %s"
% error)
return routers
def __cmp_published__(x, y):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment