diff options
| -rw-r--r-- | README.md | 4 | ||||
| -rw-r--r-- | miasm/analysis/binary.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/README.md b/README.md index dd956254..fa76a694 100644 --- a/README.md +++ b/README.md @@ -517,7 +517,9 @@ Documentation TODO -An auto-generated documentation is available [here](http://miasmdoc.ajax.re). +An auto-generated documentation is available: +* [Doxygen](http://miasm.re/miasm_doxygen) +* [pdoc](http://miasm.re/miasm_pdoc) Obtaining Miasm =============== 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 |