hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: clipboard data, decompress, buf too small (#8556)

Browse Source 
* fix: clipboard data, decompress, buf too small

Signed-off-by: fufesou <linlong1266@gmail.com>

* fix: compress image

Signed-off-by: fufesou <linlong1266@gmail.com>

* decompress image, use default level

Signed-off-by: fufesou <linlong1266@gmail.com>

* chore

Signed-off-by: fufesou <linlong1266@gmail.com>

* decompress, zstd::decode_all

Signed-off-by: fufesou <linlong1266@gmail.com>

---------

Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou 2024-07-02 00:18:38 +08:00 committed by GitHub
parent 0ab500c27c
commit 62a8349739
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libs/hbb_common/src/compress.rs
View File

@ -1,5 +1,5 @@
use std::{cell::RefCell, io}; use std::{cell::RefCell, io};
use zstd::bulk::{Compressor, Decompressor}; use zstd::bulk::Compressor;
// The library supports regular compression levels from 1 up to ZSTD_maxCLevel(), // The library supports regular compression levels from 1 up to ZSTD_maxCLevel(),
// which is currently 22. Levels >= 20 // which is currently 22. Levels >= 20
@ -7,7 +7,6 @@ use zstd::bulk::{Compressor, Decompressor};
// value 0 means default, which is controlled by ZSTD_CLEVEL_DEFAULT // value 0 means default, which is controlled by ZSTD_CLEVEL_DEFAULT
thread_local! { thread_local! {
static COMPRESSOR: RefCell<io::Result<Compressor<'static>>> = RefCell::new(Compressor::new(crate::config::COMPRESS_LEVEL)); static COMPRESSOR: RefCell<io::Result<Compressor<'static>>> = RefCell::new(Compressor::new(crate::config::COMPRESS_LEVEL));
static DECOMPRESSOR: RefCell<io::Result<Decompressor<'static>>> = RefCell::new(Decompressor::new());
} }
pub fn compress(data: &[u8]) -> Vec<u8> { pub fn compress(data: &[u8]) -> Vec<u8> {
@ -31,27 +30,5 @@ pub fn compress(data: &[u8]) -> Vec<u8> {
} }
pub fn decompress(data: &[u8]) -> Vec<u8> { pub fn decompress(data: &[u8]) -> Vec<u8> {
let mut out = Vec::new(); zstd::decode_all(data).unwrap_or_default()
DECOMPRESSOR.with(|d| {
if let Ok(mut d) = d.try_borrow_mut() {
match &mut *d {
Ok(d) => {
const MAX: usize = 1024 * 1024 * 64;
const MIN: usize = 1024 * 1024;
let mut n = 30 * data.len();
n = n.clamp(MIN, MAX);
match d.decompress(data, n) {
Ok(res) => out = res,
Err(err) => {
crate::log::debug!("Failed to decompress: {}", err);
}
}
}
Err(err) => {
crate::log::debug!("Failed to get decompressor: {}", err);
}
}
}
});
out
} }

5
src/clipboard.rs
View File

@ -5,11 +5,11 @@ use std::sync::{
use clipboard_master::{CallbackResult, ClipboardHandler, Master, Shutdown}; use clipboard_master::{CallbackResult, ClipboardHandler, Master, Shutdown};
use hbb_common::{ use hbb_common::{
ResultType,
allow_err, allow_err,
compress::{compress as compress_func, decompress}, compress::{compress as compress_func, decompress},
log, log,
message_proto::*, message_proto::*,
ResultType,
}; };
pub const CLIPBOARD_NAME: &'static str = "clipboard"; pub const CLIPBOARD_NAME: &'static str = "clipboard";
@ -218,12 +218,13 @@ impl ClipboardData {
} }
fn from_msg(clipboard: Clipboard) -> Self { fn from_msg(clipboard: Clipboard) -> Self {
let is_image = clipboard.width > 0 && clipboard.height > 0;
let data = if clipboard.compress { let data = if clipboard.compress {
decompress(&clipboard.content) decompress(&clipboard.content)
} else { } else {
clipboard.content.into() clipboard.content.into()
}; };
if clipboard.width > 0 && clipboard.height > 0 { if is_image {
ClipboardData::Image( ClipboardData::Image(
arboard::ImageData { arboard::ImageData {
bytes: data.into(), bytes: data.into(),