mirrors/IronRDP
1
0
Fork 0
mirror of https://github.com/Devolutions/IronRDP.git synced 2025-08-04 15:18:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix(rdpsnd): correct TrainingPdu wPackSize field

Browse source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2025-04-08 15:09:19 +04:00 • committed by Benoît Cortier
parent 032c38be92
commit abcc42e01f
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
crates/ironrdp-rdpsnd/src/pdu/mod.rs
View file

@ -599,7 +599,12 @@ impl Encode for TrainingPdu {
ensure_size!(in: dst, size: self.size());
dst.write_u16(self.timestamp);
dst.write_u16(cast_length!("TrainingPdu::wPackSize", self.data.len())?);
let len = if self.data.is_empty() {
0
} else {
self.size() + ServerAudioOutputPdu::FIXED_PART_SIZE
};
dst.write_u16(cast_length!("TrainingPdu::wPackSize", len)?);
dst.write_slice(&self.data);
Ok(())
@ -622,8 +627,16 @@ impl<'de> Decode<'de> for TrainingPdu {
let timestamp = src.read_u16();
let len = src.read_u16() as usize;
ensure_size!(in: src, size: len);
let data = src.read_slice(len).into();
let data = if len != 0 {
if len < Self::FIXED_PART_SIZE + ServerAudioOutputPdu::FIXED_PART_SIZE {
return Err(invalid_field_err!("TrainingPdu::wPackSize", "too small"));
}
let len = len - Self::FIXED_PART_SIZE - ServerAudioOutputPdu::FIXED_PART_SIZE;
ensure_size!(in: src, size: len);
src.read_slice(len).into()
} else {
Vec::new()
};
Ok(Self { timestamp, data })
}

2
crates/ironrdp-testsuite-core/tests/rdpsnd/mod.rs
View file

@ -148,7 +148,7 @@ encode_decode_test! {
data: vec![0x42],
}),
[
0x06, 0x00, 0x05, 0x00, 0xda, 0x89, 0x01, 0x00, 0x42
0x06, 0x00, 0x05, 0x00, 0xda, 0x89, 0x09, 0x00, 0x42
];
training_confirm: pdu::ClientAudioOutputPdu::TrainingConfirm(pdu::TrainingConfirmPdu {
timestamp: 0x89da,