From d082d029a2ecdb24e6c56425f79ed77ae120770b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 13 Aug 2024 23:22:37 +0400 Subject: [PATCH] feat(pdu): check scan_width during encoding too MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marc-André Lureau --- crates/ironrdp-pdu/src/basic_output/bitmap.rs | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/crates/ironrdp-pdu/src/basic_output/bitmap.rs b/crates/ironrdp-pdu/src/basic_output/bitmap.rs index dc0ef969..6d4e68eb 100644 --- a/crates/ironrdp-pdu/src/basic_output/bitmap.rs +++ b/crates/ironrdp-pdu/src/basic_output/bitmap.rs @@ -244,6 +244,12 @@ impl PduEncode for CompressedDataHeader { fn encode(&self, dst: &mut crate::cursor::WriteCursor<'_>) -> PduResult<()> { ensure_fixed_part_size!(in: dst); + if self.scan_width % 4 != 0 { + return Err(invalid_message_err!( + "cbScanWidth", + "The width of the bitmap must be divisible by 4" + )); + } dst.write_u16(FIRST_ROW_SIZE_VALUE); dst.write_u16(self.main_body_size); dst.write_u16(self.scan_width);