Fix loading json file causing coredump
If the json file is damaged, when the process is running and
deserializing, a coredump will occur and a ereal::RapidJSONException
will be thrown.
Signed-off-by: George Liu <liuxiwei@inspur.com>
Change-Id: I601865e796d50241262edf0fdb09935e4e1b93e2
diff --git a/sensor-monitor/alarm_timestamps.hpp b/sensor-monitor/alarm_timestamps.hpp
index 0c7d148..1fbc80c 100644
--- a/sensor-monitor/alarm_timestamps.hpp
+++ b/sensor-monitor/alarm_timestamps.hpp
@@ -224,16 +224,29 @@
return;
}
- std::ifstream stream{path.c_str()};
- cereal::JSONInputArchive iarchive{stream};
- iarchive(times);
-
- for (const auto& [path, shutdownType, alarmType, timestamp] : times)
+ try
{
- timestamps.emplace(AlarmKey{path,
- static_cast<ShutdownType>(shutdownType),
- static_cast<AlarmType>(alarmType)},
- timestamp);
+ std::ifstream stream{path.c_str()};
+ cereal::JSONInputArchive iarchive{stream};
+ iarchive(times);
+
+ for (const auto& [path, shutdownType, alarmType, timestamp] : times)
+ {
+ timestamps.emplace(
+ AlarmKey{path, static_cast<ShutdownType>(shutdownType),
+ static_cast<AlarmType>(alarmType)},
+ timestamp);
+ }
+ }
+ catch (const std::exception& e)
+ {
+ // Include possible exception when removing file, otherwise ec = 0
+ std::error_code ec;
+ fs::remove(path, ec);
+ log<level::ERR>(
+ fmt::format("Unable to restore persisted times ({}, ec: {})",
+ e.what(), ec.value())
+ .c_str());
}
}