diff options
| author | Hans Nilsson <[email protected]> | 2014-02-05 16:37:25 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2014-02-05 16:37:25 +0100 |
| commit | 665d708cf6804d552a07d294317e2c10443b5a62 (patch) | |
| tree | 2234ddfa136ac4d72ff8cf6be2fae031efff8364 /lib/ssh | |
| parent | 88a40030a9d7a81a51824cfa17427f4ed4ed2156 (diff) | |
| parent | a6e276c39becc11c5be5d45aaa019dd484b881c5 (diff) | |
| download | otp-665d708cf6804d552a07d294317e2c10443b5a62.tar.gz otp-665d708cf6804d552a07d294317e2c10443b5a62.tar.bz2 otp-665d708cf6804d552a07d294317e2c10443b5a62.zip | |
Merge branch 'hans/ssh/decode_error/OTP-11667'
* hans/ssh/decode_error/OTP-11667:
Fix that result on stderr sent back to ssh:exec had length info present
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/src/ssh_message.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_message.erl b/lib/ssh/src/ssh_message.erl index 01a0988718..fa4397b2f5 100644 --- a/lib/ssh/src/ssh_message.erl +++ b/lib/ssh/src/ssh_message.erl @@ -315,8 +315,8 @@ decode(<<?BYTE(?SSH_MSG_CHANNEL_DATA), ?UINT32(Recipient), ?UINT32(Len), Data:Le recipient_channel = Recipient, data = Data }; -decode(<<?BYTE(?SSH_MSG_CHANNEL_EXTENDED_DATA), ?UINT32(Recipient), - ?UINT32(DataType), Data/binary>>) -> +decode(<<?BYTE(?SSH_MSG_CHANNEL_EXTENDED_DATA), ?UINT32(Recipient), + ?UINT32(DataType), ?UINT32(Len), Data:Len/binary>>) -> #ssh_msg_channel_extended_data{ recipient_channel = Recipient, data_type_code = DataType, |