mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-10 00:42:41 +01:00
Fix a Mercurial wire protocol parser issue when we receive a length frame before any data
Summary: Depends on D18856. Ref T13036. See PHI275. When we receive a length frame but the buffer doesn't have any data yet, we currently emit a pointless 0-length data frame on the channel. For normal chatter this is harmless/valid, but it causes problems when a channel has transitioned into bundle2 mode (probably it indicates "end of stream")? In any case, it's never helpful, so if we're about to read a data block and don't have any data, just bail out until we see some more data. Note that we can't end up here //expecting// a 0-length data block: both the `data-length` and `data-bytes` states already handle that properly. Test Plan: Pushed 4MB changes to a Mercurial repository with Mercurial 4.1.1, was no longer able to hit channel errors. Reviewers: amckinley Reviewed By: amckinley Maniphest Tasks: T13036 Differential Revision: https://secure.phabricator.com/D18857
This commit is contained in:
parent
3a4e14431f
commit
13c8963dab
1 changed files with 7 additions and 0 deletions
|
@ -192,6 +192,13 @@ final class DiffusionMercurialWireClientSSHProtocolChannel
|
|||
$this->state = 'data-bytes';
|
||||
}
|
||||
} else if ($this->state == 'data-bytes') {
|
||||
// If we don't have any more bytes on the buffer yet, just bail:
|
||||
// otherwise, we'll emit a pointless and possibly harmful 0-byte data
|
||||
// frame. See T13036 for discussion.
|
||||
if (!strlen($this->buffer)) {
|
||||
break;
|
||||
}
|
||||
|
||||
$bytes = substr($this->buffer, 0, $this->expectBytes);
|
||||
$this->buffer = substr($this->buffer, strlen($bytes));
|
||||
$this->expectBytes -= strlen($bytes);
|
||||
|
|
Loading…
Reference in a new issue