From 3e6c8ea1a7623771be4f8b60422ebc8a1b4d7730 Mon Sep 17 00:00:00 2001 From: Sam Lin Date: Fri, 11 Feb 2022 18:24:23 -0800 Subject: Uses ymal SafeLoader instead Bug: 218593350, 203499903 Test: ./bootanalyze.sh Change-Id: I3f0a08fda5f74e1949a8bb0d2fdffa2e18e6ab11 (cherry picked from commit 0542d40c31cf0abee2af138239821446b276dd45) --- boottime_tools/bootanalyze/bootanalyze.py | 2 +- boottime_tools/bootanalyze/bugreport_anayze.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/boottime_tools/bootanalyze/bootanalyze.py b/boottime_tools/bootanalyze/bootanalyze.py index 5bed9f29..af166949 100755 --- a/boottime_tools/bootanalyze/bootanalyze.py +++ b/boottime_tools/bootanalyze/bootanalyze.py @@ -84,7 +84,7 @@ def main(): value = float(kv[1]) components_to_monitor[key] = value - cfg = yaml.load(args.config, Loader=yaml.FullLoader) + cfg = yaml.load(args.config, Loader=yaml.SafeLoader) if args.stressfs: if run_adb_cmd('install -r -g ' + args.stressfs) != 0: diff --git a/boottime_tools/bootanalyze/bugreport_anayze.py b/boottime_tools/bootanalyze/bugreport_anayze.py index 3ea7552e..07c8b8d8 100644 --- a/boottime_tools/bootanalyze/bugreport_anayze.py +++ b/boottime_tools/bootanalyze/bugreport_anayze.py @@ -138,7 +138,7 @@ class Parser: self.re_log_start = re.compile(LOG_START_PATTERN) self.re_log_end = re.compile(LOG_END_PATTERN) self.f = bugreport_file - cfg = yaml.load(config_file, Loader=yaml.FullLoader) + cfg = yaml.load(config_file, Loader=yaml.SafeLoader) self.event_patterns = {key: re.compile(pattern) for key, pattern in cfg['events'].iteritems()} self.timing_patterns = {key: re.compile(pattern) -- cgit v1.2.3