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

Merge pull request #1900 from 64kramsystem/fix_locks_not_acquired

Browse Source 
hbb_common: Fix CONFIG locks unintentionally not acquired
This commit is contained in:
RustDesk 2022-11-01 23:24:43 +08:00 committed by GitHub
commit 789130e93d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 { impl PeerConfig {
pub fn load(id: &str) -> 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)) { match confy::load_path(&Self::path(id)) {
Ok(config) => { Ok(config) => {
let mut config: PeerConfig = config; let mut config: PeerConfig = config;
@ -827,7 +827,7 @@ impl PeerConfig {
} }
pub fn store(&self, id: &str) { pub fn store(&self, id: &str) {
let _ = CONFIG.read().unwrap(); // for lock let _lock = CONFIG.read().unwrap();
let mut config = self.clone(); let mut config = self.clone();
config.password = encrypt_vec_or_original(&config.password, PASSWORD_ENC_VERSION); config.password = encrypt_vec_or_original(&config.password, PASSWORD_ENC_VERSION);
config config
@ -999,7 +999,7 @@ pub struct LanPeers {
impl LanPeers { impl LanPeers {
pub fn load() -> LanPeers { pub fn load() -> LanPeers {
let _ = CONFIG.read().unwrap(); // for lock let _lock = CONFIG.read().unwrap();
match confy::load_path(&Config::file_("_lan_peers")) { match confy::load_path(&Config::file_("_lan_peers")) {
Ok(peers) => peers, Ok(peers) => peers,
Err(err) => { Err(err) => {