diff options
| author | serpilliere <serpilliere@users.noreply.github.com> | 2020-09-09 20:06:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-09 20:06:56 +0200 |
| commit | 26cf692d33dff9e2b42475d2f735d4891e664c5f (patch) | |
| tree | 72c61ea0520733d424f8cbf39c24c013911eabd9 | |
| parent | 11f95aec61a5ab04d16e297164a9e7bc9434f786 (diff) | |
| parent | 13c30124a6eed671ef1d54260346b845be6ecbca (diff) | |
| download | miasm-26cf692d33dff9e2b42475d2f735d4891e664c5f.tar.gz miasm-26cf692d33dff9e2b42475d2f735d4891e664c5f.zip | |
Merge pull request #1288 from a-vincent/require-loc_db-in-from_stream
Mandate passing loc_db to from_stream(). From_string() needs it.
| -rw-r--r-- | miasm/analysis/binary.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/miasm/analysis/binary.py b/miasm/analysis/binary.py index 0548dc9d..c278594b 100644 --- a/miasm/analysis/binary.py +++ b/miasm/analysis/binary.py @@ -64,14 +64,14 @@ class Container(object): cls.fallback_container = container @classmethod - def from_stream(cls, stream, *args, **kwargs): + def from_stream(cls, stream, loc_db, *args, **kwargs): """Instantiate a container and parse the binary @stream: stream to use as binary @vm: (optional) VmMngr instance to link with the executable @addr: (optional) Base address of the parsed binary. If set, force the unknown format """ - return Container.from_string(stream.read(), *args, **kwargs) + return Container.from_string(stream.read(), loc_db, *args, **kwargs) def parse(self, data, *args, **kwargs): """Launch parsing of @data |