mirror/rustdesk
1
0
Fork 0
mirror of https://github.com/rustdesk/rustdesk.git synced 2024-11-24 12:29:04 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

hbb_common: Fix CONFIG locks unintentionally not acquired

Browse Source 
Variables defined as `_` only are released immediately; see compile error:

    error: non-binding let on a synchronization lock
      --> libs/hbb_common/src/config.rs:798:13
        |
    798 |         let _ = CONFIG.read().unwrap(); // for lock
        |             ^   ^^^^^^^^^^^^^^^^^^^^^^ this binding will immediately drop the value assigned to it
        |             |
        |             this lock is not assigned to a binding and is immediately dropped
        |
        = note: `#[deny(let_underscore_lock)]` on by default

By appending a phony suffix to the variable name, the lock stays in scope.
This commit is contained in:
Saverio Miroddi 2022-11-01 15:08:21 +01:00
parent cd1090efea
commit b2f7e7ece5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/hbb_common/src/config.rs
View File

@ -795,7 +795,7 @@ const PEERS: &str = "peers";
impl PeerConfig {
pub fn load(id: &str) -> PeerConfig {
let _ = CONFIG.read().unwrap(); // for lock
let _lock = CONFIG.read().unwrap();
match confy::load_path(&Self::path(id)) {
Ok(config) => {
let mut config: PeerConfig = config;
@ -827,7 +827,7 @@ impl PeerConfig {
}
pub fn store(&self, id: &str) {
let _ = CONFIG.read().unwrap(); // for lock
let _lock = CONFIG.read().unwrap();
let mut config = self.clone();
config.password = encrypt_vec_or_original(&config.password, PASSWORD_ENC_VERSION);
config
@ -999,7 +999,7 @@ pub struct LanPeers {
impl LanPeers {
pub fn load() -> LanPeers {
let _ = CONFIG.read().unwrap(); // for lock
let _lock = CONFIG.read().unwrap();
match confy::load_path(&Config::file_("_lan_peers")) {
Ok(peers) => peers,
Err(err) => {