Merge branch 'master' into vmray-extractor

This commit is contained in:
Moritz
2024-08-26 11:31:18 +02:00
committed by GitHub
58 changed files with 2094 additions and 519 deletions

View File

@@ -84,8 +84,7 @@ def main() -> int:
args = _parse_args()
try:
with Path(args.capa_output).open() as capa_output:
json_data = json.load(capa_output)
json_data = json.loads(Path(args.capa_output).read_text(encoding="utf-8"))
except ValueError:
logger.error("Input data was not valid JSON, input should be a capa json output file.")
return -1