diff options
| author | serpilliere <serpilliere@users.noreply.github.com> | 2015-12-16 18:42:48 +0100 |
|---|---|---|
| committer | serpilliere <serpilliere@users.noreply.github.com> | 2015-12-16 18:42:48 +0100 |
| commit | 4915549bfcb8c7a1870f51935337c6eb7c7cda29 (patch) | |
| tree | 9b6540b736f6163197fe8dd4ff066a27a638aff4 /miasm2/core/bin_stream.py | |
| parent | b998b1a8b2814585692e885e656c48357fbbb9b8 (diff) | |
| parent | 797b00e9449368448518ffa5497935569049c3ba (diff) | |
| download | miasm-4915549bfcb8c7a1870f51935337c6eb7c7cda29.tar.gz miasm-4915549bfcb8c7a1870f51935337c6eb7c7cda29.zip | |
Merge pull request #295 from cea-sec/fix_virt_api
Update api according to Elfesteem
Diffstat (limited to 'miasm2/core/bin_stream.py')
| -rw-r--r-- | miasm2/core/bin_stream.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/miasm2/core/bin_stream.py b/miasm2/core/bin_stream.py index 6e158061..f7b160f9 100644 --- a/miasm2/core/bin_stream.py +++ b/miasm2/core/bin_stream.py @@ -108,7 +108,7 @@ class bin_stream_file(bin_stream): return self.bin.tell() - self.shift def setoffset(self, val): - self.bin.seek(val + self.shift) + self.bin.seek(val + self.shift) offset = property(getoffset, setoffset) def readbs(self, l=1): @@ -123,7 +123,6 @@ class bin_stream_file(bin_stream): return self.l - (self.offset + self.shift) - class bin_stream_container(bin_stream): def __init__(self, virt_view, offset=0L): @@ -142,13 +141,13 @@ class bin_stream_container(bin_stream): if self.offset + l > self.l: raise IOError("not enough bytes") self.offset += l - return self.bin(self.offset - l, self.offset) + return self.bin.get(self.offset - l, self.offset) def getbytes(self, start, l=1): - return self.bin(start, start + l) + return self.bin.get(start, start + l) def __str__(self): - out = self.bin(self.offset, self.l) + out = self.bin.get(self.offset, self.offset + self.l) return out def setoffset(self, val): |