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(session): return the correct updated region

Browse source 
"update_rectangle" is set to empty(). The surface updates are then added
by "union". But a union with an empty rectangle at (0,0) is still a
rectangle at (0,0). We end up with big region updates rooted at (0,0)...

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
This commit is contained in:
Marc-André Lureau 2025-04-03 00:19:04 +04:00 • committed by Benoît Cortier
parent 9f0edcc4c9
commit 7507a152f1
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
crates/ironrdp-session/src/fast_path.rs
View file

@ -310,7 +310,7 @@ impl Processor {
output: &mut WriteBuf,
surface_commands: Vec<SurfaceCommand<'_>>,
) -> SessionResult<InclusiveRectangle> {
let mut update_rectangle = InclusiveRectangle::empty();
let mut update_rectangle = None;
for command in surface_commands {
match command {
@ -343,7 +343,9 @@ impl Processor {
32 => {
let rectangle =
image.apply_rgb32_bitmap(ext_data.data, PixelFormat::BgrX32, &destination)?;
update_rectangle = update_rectangle.union(&rectangle);
update_rectangle = update_rectangle
.map(|rect: InclusiveRectangle| rect.union(&rectangle))
.or(Some(rectangle));
}
bpp => {
warn!("Unsupported bpp: {bpp}")
@ -354,7 +356,9 @@ impl Processor {
let mut data = ReadCursor::new(bits.extended_bitmap_data.data);
while !data.is_empty() {
let (_frame_id, rectangle) = self.rfx_handler.decode(image, &destination, &mut data)?;
update_rectangle = update_rectangle.union(&rectangle);
update_rectangle = update_rectangle
.map(|rect: InclusiveRectangle| rect.union(&rectangle))
.or(Some(rectangle));
}
}
}
@ -370,7 +374,7 @@ impl Processor {
}
}
Ok(update_rectangle)
Ok(update_rectangle.unwrap_or_else(InclusiveRectangle::empty))
}
}