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 1/2] 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 From 168d976377cef7bd55eb8030ef01a2679f92407f Mon Sep 17 00:00:00 2001 From: DastInDark <2350416+hitenkoku@users.noreply.github.com> Date: Mon, 22 Aug 2022 18:08:42 +0900 Subject: [PATCH 2/2] updated changelog #674 --- CHANGELOG-Japanese.md | 2 +- CHANGELOG.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG-Japanese.md b/CHANGELOG-Japanese.md index 43c343a0..93d007f2 100644 --- a/CHANGELOG-Japanese.md +++ b/CHANGELOG-Japanese.md @@ -13,7 +13,7 @@ **バグ修正:** -- XXX +- ログオン情報の要約オプションを追加した場合に、Hayabusaがクラッシュしていたのを修正した。 (#674) (@hitenkoku) ## v1.5.1 [2022/08/20] diff --git a/CHANGELOG.md b/CHANGELOG.md index 00cae0f8..e29f2e03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ **Bug Fixes:** -- XXX +- Hayabusa would crash with `-L` option (logon summary option). (#674) (@hitenkoku) ## v1.5.1 [2022/08/20]