From 318c908dd8bfd143c6e8b096342d0e47ecf7b4ed Mon Sep 17 00:00:00 2001 From: tek Date: Wed, 8 Feb 2023 20:03:45 +0100 Subject: [PATCH] Fixes bug in adb File module. Fixes #268 --- mvt/android/modules/adb/files.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mvt/android/modules/adb/files.py b/mvt/android/modules/adb/files.py index 0ae138f..cae821b 100644 --- a/mvt/android/modules/adb/files.py +++ b/mvt/android/modules/adb/files.py @@ -83,12 +83,13 @@ class Files(AndroidExtraction): cmd = f"find '{folder}' -type f -printf '%T@ %m %s %u %g %p\n' 2> /dev/null" output = self._adb_command(cmd) - if output.strip() == "": - return - for file_line in output.splitlines(): + file_info = file_line.rstrip().split(" ", 5) + if len(file_line) < 6: + self.log.info("Skipping invalid file info - %s", file_line.rstrip()) + continue [unix_timestamp, mode, size, - owner, group, full_path] = file_line.rstrip().split(" ", 5) + owner, group, full_path] = file_info mod_time = convert_unix_to_iso(unix_timestamp) self.results.append({