build(deps): bump png from 0.17.16 to 0.18.0 (#961)

Author: dependabot[bot]

Cargo.lock

@@ -17,7 +17,7 @@ test = false
 
 [dependencies]
 ironrdp-core = { path = "../ironrdp-core", version = "0.1" } # public
-png = "0.17"
+png = "0.18"
 
 [lints]
 workspace = true

crates/ironrdp-cliprdr-format/Cargo.toml

@@ -1,3 +1,5 @@
+use std::io::Cursor;
+
 use ironrdp_core::{
     cast_int, ensure_fixed_part_size, invalid_field_err, Decode, DecodeResult, Encode, EncodeResult, ReadCursor,
     WriteCursor,
@@ -735,13 +737,15 @@ fn top_down_rgba_to_bottom_up_bgra(
 }
 
 fn decode_png(mut input: &[u8]) -> Result<(png::OutputInfo, Vec<u8>), BitmapError> {
-    let mut decoder = png::Decoder::new(&mut input);
+    let mut decoder = png::Decoder::new(Cursor::new(&mut input));
 
     // We need to produce 32-bit DIB, so we should expand the palette to 32-bit RGBA.
     decoder.set_transformations(png::Transformations::ALPHA | png::Transformations::EXPAND);
 
     let mut reader = decoder.read_info()?;
-    let output_buffer_len = reader.output_buffer_size();
+    let Some(output_buffer_len) = reader.output_buffer_size() else {
+        return Err(BitmapError::BufferTooBig);
+    };
 
     // Prevent allocation of huge buffers.
     ensure(output_buffer_len <= MAX_BUFFER_SIZE).ok_or(BitmapError::BufferTooBig)?;

crates/ironrdp-cliprdr-format/src/bitmap.rs

@@ -47,7 +47,7 @@ ironrdp-rdpsnd.path = "../ironrdp-rdpsnd"
 ironrdp-session = { path = "../ironrdp-session", features = ["qoi"] }
 ironrdp-propertyset.path = "../ironrdp-propertyset"
 ironrdp-rdpfile.path = "../ironrdp-rdpfile"
-png = "0.17"
+png = "0.18"
 pretty_assertions = "1.4"
 proptest.workspace = true
 rstest.workspace = true

crates/ironrdp-testsuite-core/Cargo.toml

@@ -1,3 +1,5 @@
+use std::io::Cursor;
+
 use expect_test::expect;
 use ironrdp_graphics::pointer::{DecodedPointer, PointerBitmapTarget};
 use ironrdp_pdu::pointer::{
@@ -27,8 +29,8 @@ fn expect_pointer_png(pointer: &DecodedPointer, expected_file_path: &str) {
     }
 
     let png_buffer = std::fs::read(path).unwrap();
-    let mut png_reader = png::Decoder::new(&png_buffer[..]).read_info().unwrap();
-    let mut png_reader_buffer = vec![0u8; png_reader.output_buffer_size()];
+    let mut png_reader = png::Decoder::new(Cursor::new(&png_buffer[..])).read_info().unwrap();
+    let mut png_reader_buffer = vec![0u8; png_reader.output_buffer_size().unwrap()];
     let frame_size = png_reader.next_frame(&mut png_reader_buffer).unwrap().buffer_size();
     let expected = &png_reader_buffer[..frame_size];
     assert_eq!(expected, &pointer.bitmap_data);

crates/ironrdp-testsuite-core/tests/pdu/pointer.rs

@@ -54,7 +54,7 @@ gloo-timers = { version = "0.3", default-features = false, features = ["futures"
 
 # Rendering
 softbuffer = { version = "0.4", default-features = false }
-png = "0.17"
+png = "0.18"
 resize = { version = "0.8", features = ["std"], default-features = false }
 rgb = "0.8"