From d774c90ee01ba8f52e0b344bad6912cdb9e62b96 Mon Sep 17 00:00:00 2001 From: DastInDark <2350416+hitenkoku@users.noreply.github.com> Date: Mon, 22 Aug 2022 18:04:22 +0900 Subject: [PATCH] fixed crash in event id value is string case #674 --- src/timeline/statistics.rs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/timeline/statistics.rs b/src/timeline/statistics.rs index f2debc94..6e6982e1 100644 --- a/src/timeline/statistics.rs +++ b/src/timeline/statistics.rs @@ -110,8 +110,21 @@ impl EventStatistics { if evtid.is_none() { continue; } + let idnum: i64 = if evtid.unwrap().is_number() { + evtid.unwrap().as_i64().unwrap() + } else { + evtid + .unwrap() + .as_str() + .unwrap() + .parse::() + .unwrap_or_default() + }; + if !(idnum == 4624 || idnum == 4625) { + continue; + } + let username = utils::get_event_value("TargetUserName", &record.record); - let idnum = evtid.unwrap().as_i64().unwrap(); let countlist: [usize; 2] = [0, 0]; if idnum == 4624 { let count: &mut [usize; 2] = self