Magic-Mirror/retdec
1
0
Fork 0
mirror of https://github.com/avast/retdec.git synced 2024-12-20 04:18:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

scripts: Fix generation of a log file when calling retdec-decompiler.py --generate-log.

Browse Source 
The original escaping was flawed (for example, it did not escape backslashes,
which caused the produced JSONs to be invalid). The fix is to use json.dump() [1],
which properly escapes all the needed characters.

[1] https://docs.python.org/3/library/json.html#json.dump
This commit is contained in:
Petr Zemek 2019-04-08 18:15:25 +02:00 committed by Peter Matula
parent 2e4fbed5cb
commit 3a53dbfa6b
1 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
scripts/retdec-decompiler.py
View File

@ -7,6 +7,7 @@ from __future__ import print_function
import argparse
import glob
import importlib
import json
import os
import shutil
import sys
@ -569,35 +570,46 @@ class Decompiler:
utils.remove_file_forced(sig)
def _generate_log(self):
log_file = self.output_file + '.decompilation.log'
log_decompilation_end_date = str(int(time.time()))
self.log_fileinfo_output = self._json_escape(self.log_fileinfo_output)
self.log_unpacker_output = self._json_escape(self.log_unpacker_output)
self.log_bin2llvmir_output = self._json_escape(self.log_bin2llvmir_output)
self.log_llvmir2hll_output = self._json_escape(self.log_llvmir2hll_output)
self.log_fileinfo_output = self.log_fileinfo_output
self.log_unpacker_output = self.log_unpacker_output
self.log_bin2llvmir_output = self.log_bin2llvmir_output
self.log_llvmir2hll_output = self.log_llvmir2hll_output
log_structure = '{\n\t\"input_file\" : \"%s\",\n\t\"pdb_file\" : \"%s\",\n\t\"start_date\" : \"%s\",\n\t\"' \
'end_date\" : \"%s\",\n\t\"mode\" : \"%s\",\n\t\"arch\" : \"%s\",\n\t\"format\" : \"%s\",\n\t\"' \
'fileinfo_rc\" : \"%s\",\n\t\"unpacker_rc\" : \"%s\",\n\t\"bin2llvmir_rc\" : \"%s\",\n\t\"' \
'llvmir2hll_rc\" : \"%s\",\n\t\"fileinfo_output\" : \"%s\",\n\t\"unpacker_output\" : \"%s\",' \
'\n\t\"bin2llvmir_output\" : \"%s\",\n\t\"llvmir2hll_output\" : \"%s\",\n\t\"fileinfo_runtime\"' \
' : \"%s\",\n\t\"bin2llvmir_runtime\" : \"%s\",\n\t\"llvmir2hll_runtime\" : \"%s\",\n\t\"' \
'fileinfo_memory\" : \"%s\",\n\t\"bin2llvmir_memory\" : \"%s\",\n\t\"llvmir2hll_memory\"' \
' : \"%s\"\n}\n'
log = {
'input_file': self.input_file,
'pdb_file': self.pdb_file,
'start_date': self.log_decompilation_start_date,
'end_date': log_decompilation_end_date,
'mode': self.mode,
'arch': self.arch,
'format': self.format,
'fileinfo_rc': self.log_fileinfo_rc,
'unpacker_rc': self.log_unpacker_rc,
'bin2llvmir_rc': self.log_bin2llvmir_rc,
'llvmir2hll_rc': self.log_llvmir2hll_rc,
'fileinfo_output': self.log_fileinfo_output,
'unpacker_output': self.log_unpacker_output,
'bin2llvmir_output': self.log_bin2llvmir_output,
'llvmir2hll_output': self.log_llvmir2hll_output,
'fileinfo_runtime': self.log_fileinfo_time,
'bin2llvmir_runtime': self.log_bin2llvmir_time,
'llvmir2hll_runtime': self.log_llvmir2hll_time,
'fileinfo_memory': self.log_fileinfo_memory,
'bin2llvmir_memory': self.log_bin2llvmir_memory,
'llvmir2hll_memory': self.log_llvmir2hll_memory,
}
json_string = log_structure % (
self.input_file, self.pdb_file, self.log_decompilation_start_date, log_decompilation_end_date, self.mode,
self.arch, self.format, self.log_fileinfo_rc, self.log_unpacker_rc, self.log_bin2llvmir_rc,
self.log_llvmir2hll_rc, self.log_fileinfo_output, self.log_unpacker_output, self.log_bin2llvmir_output,
self.log_llvmir2hll_output, self.log_fileinfo_time, self.log_bin2llvmir_time, self.log_llvmir2hll_time,
self.log_fileinfo_memory, self.log_bin2llvmir_memory, self.log_llvmir2hll_memory)
# The consumer of the log currently assumes that all values are
# strings, so ensure that everything is a string.
for k, v in log.items():
log[k] = str(v)
with open(log_file, 'w+') as f:
f.write(json_string)
def _json_escape(self, string):
return string.rstrip('\r\n').replace('\n', r'\n') if string else None
log_file = self.output_file + '.decompilation.log'
with open(log_file, 'w') as f:
json.dump(log, f, indent=4)
f.write('\n')
def decompile(self):
# Check arguments and set default values for unset options.