Added optional message parameter in ConcretizeMemory (#885)

* Added optional message parameter in ConcretizeMemory

In some files (e.g. manticore/core/cpu/abstractcpu.py), ConcretizeMemory is invoked with a message but it is interpreted as the "policy" value now, causing a crash. This commit should fix that issue.

* Small code refactoring to address code review
This commit is contained in:
ggrieco-tob 2018-05-07 10:23:40 -03:00 committed by Yan Ivnitskiy
parent 109180fc15
commit b9a515ccfe

View File

@ -34,8 +34,11 @@ class ConcretizeMemory(MemoryException):
Raised when a symbolic memory cell needs to be concretized.
'''
def __init__(self, mem, address, size, policy='MINMAX'):
self.message = "Concretizing memory address {} size {}".format(address, size)
def __init__(self, mem, address, size, message=None, policy='MINMAX'):
if message is None:
self.message = "Concretizing memory address {} size {}".format(address, size)
else:
self.message = message
self.mem = mem
self.address = address
self.size = size