From 04225a4455a6e005b02200159218b7b9e2c5d355 Mon Sep 17 00:00:00 2001 From: Nex Date: Thu, 3 Feb 2022 19:40:36 +0100 Subject: [PATCH] Ignoring decoding errors --- mvt/android/modules/bugreport/accessibility.py | 2 +- mvt/android/modules/bugreport/activities.py | 2 +- mvt/android/modules/bugreport/battery_daily.py | 2 +- mvt/android/modules/bugreport/battery_history.py | 2 +- mvt/android/modules/bugreport/dbinfo.py | 2 +- mvt/android/modules/bugreport/getprop.py | 2 +- mvt/android/modules/bugreport/packages.py | 2 +- mvt/android/modules/bugreport/receivers.py | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mvt/android/modules/bugreport/accessibility.py b/mvt/android/modules/bugreport/accessibility.py index d3827e2..adb91e6 100644 --- a/mvt/android/modules/bugreport/accessibility.py +++ b/mvt/android/modules/bugreport/accessibility.py @@ -43,7 +43,7 @@ class Accessibility(BugReportModule): lines = [] in_accessibility = False - for line in content.decode().splitlines(): + for line in content.decode(errors="ignore").splitlines(): if line.strip() == "DUMP OF SERVICE accessibility:": in_accessibility = True continue diff --git a/mvt/android/modules/bugreport/activities.py b/mvt/android/modules/bugreport/activities.py index 1c81221..0db5d94 100644 --- a/mvt/android/modules/bugreport/activities.py +++ b/mvt/android/modules/bugreport/activities.py @@ -46,7 +46,7 @@ class Activities(BugReportModule): lines = [] in_package = False - for line in content.decode().splitlines(): + for line in content.decode(errors="ignore").splitlines(): if line.strip() == "DUMP OF SERVICE package:": in_package = True continue diff --git a/mvt/android/modules/bugreport/battery_daily.py b/mvt/android/modules/bugreport/battery_daily.py index f04bb90..ac67b5a 100644 --- a/mvt/android/modules/bugreport/battery_daily.py +++ b/mvt/android/modules/bugreport/battery_daily.py @@ -52,7 +52,7 @@ class BatteryDaily(BugReportModule): lines = [] in_batterystats = False in_daily = False - for line in content.decode().splitlines(): + for line in content.decode(errors="ignore").splitlines(): if line.strip() == "DUMP OF SERVICE batterystats:": in_batterystats = True continue diff --git a/mvt/android/modules/bugreport/battery_history.py b/mvt/android/modules/bugreport/battery_history.py index 66ed7a0..7690dd9 100644 --- a/mvt/android/modules/bugreport/battery_history.py +++ b/mvt/android/modules/bugreport/battery_history.py @@ -44,7 +44,7 @@ class BatteryHistory(BugReportModule): lines = [] in_batterystats = False in_history = False - for line in content.decode().splitlines(): + for line in content.decode(errors="ignore").splitlines(): if line.strip() == "********** Print latest newbatterystats **********": in_batterystats = True continue diff --git a/mvt/android/modules/bugreport/dbinfo.py b/mvt/android/modules/bugreport/dbinfo.py index dd69736..1d6e1f2 100644 --- a/mvt/android/modules/bugreport/dbinfo.py +++ b/mvt/android/modules/bugreport/dbinfo.py @@ -47,7 +47,7 @@ class DBInfo(BugReportModule): in_dbinfo = False lines = [] - for line in content.decode().splitlines(): + for line in content.decode(errors="ignore").splitlines(): if line.strip() == "DUMP OF SERVICE dbinfo:": in_dbinfo = True continue diff --git a/mvt/android/modules/bugreport/getprop.py b/mvt/android/modules/bugreport/getprop.py index 9d3bfed..c004477 100644 --- a/mvt/android/modules/bugreport/getprop.py +++ b/mvt/android/modules/bugreport/getprop.py @@ -35,7 +35,7 @@ class Getprop(BugReportModule): lines = [] in_getprop = False - for line in content.decode().splitlines(): + for line in content.decode(errors="ignore").splitlines(): if line.strip() == "------ SYSTEM PROPERTIES (getprop) ------": in_getprop = True continue diff --git a/mvt/android/modules/bugreport/packages.py b/mvt/android/modules/bugreport/packages.py index b14a6e4..da5315d 100644 --- a/mvt/android/modules/bugreport/packages.py +++ b/mvt/android/modules/bugreport/packages.py @@ -95,7 +95,7 @@ class Packages(BugReportModule): in_package = False in_packages_list = False lines = [] - for line in content.decode().splitlines(): + for line in content.decode(errors="ignore").splitlines(): if line.strip() == "DUMP OF SERVICE package:": in_package = True continue diff --git a/mvt/android/modules/bugreport/receivers.py b/mvt/android/modules/bugreport/receivers.py index 8df88a4..f8ab7f2 100644 --- a/mvt/android/modules/bugreport/receivers.py +++ b/mvt/android/modules/bugreport/receivers.py @@ -68,7 +68,7 @@ class Receivers(BugReportModule): in_receivers = False lines = [] - for line in content.decode().splitlines(): + for line in content.decode(errors="ignore").splitlines(): if line.strip() == "DUMP OF SERVICE package:": in_receivers = True continue