Rooba
/
mitogen
mirror of https://github.com/mitogen-hq/mitogen.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't infinite loop on short reads.

This commit is contained in:
David Wilson 2016-08-10 22:05:06 +01:00
parent 98da046f81
commit 34595dd00f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
econtext/core.py
View File

@ -306,15 +306,15 @@ class Stream(BasicStream):
return self.Disconnect() return self.Disconnect()
self._input_buf += buf self._input_buf += buf
while len(self._input_buf) >= 24: while len(self._input_buf) >= 24 and self._ReceiveOne():
self._ReceiveOne() pass
def _ReceiveOne(self): def _ReceiveOne(self):
msg_mac = self._input_buf[:20] msg_mac = self._input_buf[:20]
msg_len = struct.unpack('>L', self._input_buf[20:24])[0] msg_len = struct.unpack('>L', self._input_buf[20:24])[0]
if len(self._input_buf) < msg_len-24: if len(self._input_buf) < msg_len-24:
IOLOG.debug('Input too short') IOLOG.debug('Input too short')
return return False
self._rhmac.update(self._input_buf[20:msg_len+24]) self._rhmac.update(self._input_buf[20:msg_len+24])
expected_mac = self._rhmac.digest() expected_mac = self._rhmac.digest()
@ -330,6 +330,7 @@ class Stream(BasicStream):
self._input_buf = self._input_buf[msg_len+24:] self._input_buf = self._input_buf[msg_len+24:]
self._Invoke(handle, data) self._Invoke(handle, data)
return True
def _Invoke(self, handle, data): def _Invoke(self, handle, data):
LOG.debug('%r._Invoke(): handle=%r; data=%r', self, handle, data) LOG.debug('%r._Invoke(): handle=%r; data=%r', self, handle, data)