AaronFiore/electrum
1
0
Fork 0
Code Activity

fix BCDataStream.read_bytes (#5991)

Browse Source 
* fix BCDataStream.read_bytes

* followup fix BCDataStream.read_bytes: fix TestBCDataStream.test_bytes
This commit is contained in:
zebra-lucky
2020-02-25 20:58:03 +02:00
committed by GitHub
parent aaf174ef3e
commit c0be0471f2
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/tests/test_transaction.py
View File

@@ -58,8 +58,12 @@ class TestBCDataStream(ElectrumTestCase):
s.write(b'foobar') s.write(b'foobar')
self.assertEqual(s.read_bytes(3), b'foo') self.assertEqual(s.read_bytes(3), b'foo')
self.assertEqual(s.read_bytes(2), b'ba') self.assertEqual(s.read_bytes(2), b'ba')
self.assertEqual(s.read_bytes(4), b'r') with self.assertRaises(transaction.SerializationError):
self.assertEqual(s.read_bytes(1), b'') s.read_bytes(4)
self.assertEqual(s.read_bytes(0), b'')
self.assertEqual(s.read_bytes(1), b'r')
self.assertEqual(s.read_bytes(0), b'')
class TestTransaction(ElectrumTestCase): class TestTransaction(ElectrumTestCase):

12
electrum/transaction.py
View File

@@ -272,12 +272,16 @@ class BCDataStream(object):
self.write(string) self.write(string)
def read_bytes(self, length) -> bytes: def read_bytes(self, length) -> bytes:
try: assert length >= 0
result = self.input[self.read_cursor:self.read_cursor+length] # type: bytearray input_len = len(self.input)
read_begin = self.read_cursor
read_end = read_begin + length
if 0 <= read_begin <= input_len and read_end <= input_len:
result = self.input[read_begin:read_end] # type: bytearray
self.read_cursor += length self.read_cursor += length
return bytes(result) return bytes(result)
except IndexError: else:
raise SerializationError("attempt to read past end of buffer") from None raise SerializationError('attempt to read past end of buffer')
def can_read_more(self) -> bool: def can_read_more(self) -> bool:
if not self.input: if not self.input: