DeforaNetworks/manticore
3
0
Fork 0
Code Releases Activity

Fix cli --data parameter (#781)

Browse Source 
* Actually use args.data

* Update decree
This commit is contained in:
Mark Mossberg
2018-03-01 18:48:10 -05:00
committed by GitHub
parent 17e90986b8
commit 03ecb3fd9f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manticore/__main__.py
View File

@@ -107,7 +107,7 @@ def main():
env = {key:val for key, val in map(lambda env: env[0].split('='), args.env)}
m = Manticore(args.argv[0], argv=args.argv[1:], env=env, workspace_url=args.workspace, policy=args.policy, disasm=args.disasm)
m = Manticore(args.argv[0], argv=args.argv[1:], env=env, workspace_url=args.workspace, policy=args.policy, disasm=args.disasm, concrete_start=args.data)
#Fixme(felipe) remove this, move to plugin
m.coverage_file = args.coverage

8
manticore/manticore.py
View File

@@ -56,15 +56,15 @@ def make_binja(program, disasm, argv, env, symbolic_files, concrete_start=''):
initial_state = State(constraints, platform)
return initial_state
def make_decree(program, concrete_data='', **kwargs):
def make_decree(program, concrete_start='', **kwargs):
constraints = ConstraintSet()
platform = decree.SDecree(constraints, program)
initial_state = State(constraints, platform)
logger.info('Loading program %s', program)
if concrete_data != '':
logger.info('Starting with concrete input: {}'.format(concrete_data))
platform.input.transmit(concrete_data)
if concrete_start != '':
logger.info('Starting with concrete input: {}'.format(concrete_start))
platform.input.transmit(concrete_start)
platform.input.transmit(initial_state.symbolicate_buffer('+'*14, label='RECEIVE'))
return initial_state