Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-29 12:07:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added recursive loop-detection to the spawner. This should avoid accidentally creating infinite self-references in prototype structures.

Browse source
This commit is contained in:
Griatch 2014-07-01 20:16:43 +02:00
parent b9c8c1695c
commit fb8cf41b4e
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/utils/spawner.py
View file

@ -84,16 +84,21 @@ _CREATE_OBJECT_KWARGS = ("key", "location", "home", "destination")
_handle_dbref = lambda inp: handle_dbref(inp, ObjectDB)
def _get_prototype(dic, prot, protparents):
"Recursively traverse a prototype dictionary, including multiple inheritance"
def _get_prototype(dic, prot, protparents, visited):
"""
Recursively traverse a prototype dictionary,
including multiple inheritance and self-reference
detection
"""
visited.append(id(dic))
if "prototype" in dic:
# move backwards through the inheritance
prototypes = dic["prototype"]
if not hasattr(prototypes, "__iter__"):
prototypes = (prototypes,)
for prototype in prototypes:
for prototype in make_iter(dic["prototype"]):
if id(prototype) in visited:
# a loop was detected. Don't self-reference.
continue
# Build the prot dictionary in reverse order, overloading
new_prot = _get_prototype(protparents.get(prototype, {}), prot, protparents)
new_prot = _get_prototype(protparents.get(prototype, {}), prot, protparents, visited)
prot.update(new_prot)
prot.update(dic)
prot.pop("prototype", None) # we don't need this anymore
@ -181,7 +186,7 @@ def spawn(*prototypes, **kwargs):
objsparams = []
for prototype in prototypes:
prot = _get_prototype(prototype, {}, protparents)
prot = _get_prototype(prototype, {}, protparents, [])
if not prot:
continue