summaryrefslogtreecommitdiffstats
path: root/toolkit/crashreporter
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-17 09:03:13 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-17 09:03:13 +0000
commit0681b3ac9a6ab4879ca2fbfcf8aa9d00a67b8365 (patch)
tree1437375a1c16af40bb2982577c25eb9608e17566 /toolkit/crashreporter
parentAdding debian version 115.11.0esr-1~deb12u1. (diff)
downloadfirefox-esr-0681b3ac9a6ab4879ca2fbfcf8aa9d00a67b8365.tar.xz
firefox-esr-0681b3ac9a6ab4879ca2fbfcf8aa9d00a67b8365.zip
Merging upstream version 115.12.0esr.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit/crashreporter')
-rw-r--r--toolkit/crashreporter/mozwer-rust/lib.rs28
1 files changed, 23 insertions, 5 deletions
diff --git a/toolkit/crashreporter/mozwer-rust/lib.rs b/toolkit/crashreporter/mozwer-rust/lib.rs
index 16889a0cce..735d98e973 100644
--- a/toolkit/crashreporter/mozwer-rust/lib.rs
+++ b/toolkit/crashreporter/mozwer-rust/lib.rs
@@ -12,7 +12,7 @@ use serde::Serialize;
use serde_json::ser::to_writer;
use std::convert::TryInto;
use std::ffi::OsString;
-use std::fs::{read_to_string, DirBuilder, File};
+use std::fs::{read_to_string, DirBuilder, File, OpenOptions};
use std::io::{BufRead, BufReader, Write};
use std::mem::{size_of, transmute, zeroed};
use std::os::windows::ffi::{OsStrExt, OsStringExt};
@@ -442,8 +442,7 @@ impl ApplicationInformation {
let install_time = ApplicationInformation::get_install_time(
&crash_reports_dir,
&application_data.build_id,
- )
- .unwrap_or("0".to_string());
+ );
Ok(ApplicationInformation {
install_path,
@@ -514,10 +513,29 @@ impl ApplicationInformation {
}
}
- fn get_install_time(crash_reports_path: &Path, build_id: &str) -> Result<String, ()> {
+ fn get_install_time(crash_reports_path: &Path, build_id: &str) -> String {
let file_name = "InstallTime".to_owned() + build_id;
let file_path = crash_reports_path.join(file_name);
- read_to_string(file_path).map_err(|_e| ())
+
+ // If the file isn't present we'll attempt to atomically create it and
+ // populate it. This code essentially matches the corresponding code in
+ // nsExceptionHandler.cpp SetupExtraData().
+ if let Ok(mut file) = OpenOptions::new()
+ .create_new(true)
+ .write(true)
+ .open(&file_path)
+ {
+ // SAFETY: No risks in calling `time()` with a null pointer.
+ let _ = write!(&mut file, "{}", unsafe { time(null_mut()) }.to_string());
+ }
+
+ // As a last resort, if we can't read the file we fall back to the
+ // current time. This might cause us to overstate the number of users
+ // affected by a crash, but given it's very unlikely to hit this particular
+ // path it won't be a problem.
+ //
+ // SAFETY: No risks in calling `time()` with a null pointer.
+ read_to_string(&file_path).unwrap_or(unsafe { time(null_mut()) }.to_string())
}
}