grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Flush keyfiles. Resolves #7632 (#7868)

Browse Source
This commit is contained in:
Tomasz Drwięga 2018-02-12 18:03:37 +01:00 committed by Afri Schoedon
parent 1ca1fba8cf
commit 90bd6bf700
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ethstore/src/accounts_dir/disk.rs
View File

@ -15,6 +15,7 @@
// along with Parity. If not, see <http://www.gnu.org/licenses/>. // along with Parity. If not, see <http://www.gnu.org/licenses/>.
use std::{fs, io}; use std::{fs, io};
use std::io::Write;
use std::path::{PathBuf, Path}; use std::path::{PathBuf, Path};
use std::collections::HashMap; use std::collections::HashMap;
use time; use time;
@ -166,17 +167,17 @@ impl<T> DiskDirectory<T> where T: KeyFileManager {
// save the file // save the file
let mut file = fs::File::create(&keyfile_path)?; let mut file = fs::File::create(&keyfile_path)?;
if let Err(err) = self.key_manager.write(original_account, &mut file).map_err(|e| Error::Custom(format!("{:?}", e))) {
drop(file); // Write key content
fs::remove_file(keyfile_path).expect("Expected to remove recently created file"); self.key_manager.write(original_account, &mut file).map_err(|e| Error::Custom(format!("{:?}", e)))?;
return Err(err);
} file.flush()?;
if let Err(_) = restrict_permissions_to_owner(keyfile_path.as_path()) { if let Err(_) = restrict_permissions_to_owner(keyfile_path.as_path()) {
drop(file);
fs::remove_file(keyfile_path).expect("Expected to remove recently created file");
return Err(Error::Io(io::Error::last_os_error())); return Err(Error::Io(io::Error::last_os_error()));
} }
file.sync_all()?;
} }
Ok(account) Ok(account)