CalvinBackup/mvt
1
0
Fork 0
mirror of https://github.com/mvt-project/mvt.git synced 2026-07-01 19:05:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #140 from dkg/avoid-shell-True

Browse Source 
Avoid breakage with paths with unusual names
This commit is contained in:
Nex
2021-08-01 19:45:11 +02:00
committed by GitHub
parent b2e210e91c b2afce5c79
commit a3d10c1824
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mvt/ios/modules/fs/base.py
+4 -3
View File
@@ -50,13 +50,14 @@ class IOSExtraction(MVTModule):
if not shutil.which("sqlite3"):
raise DatabaseCorruptedError("Unable to recover without sqlite3 binary. Please install sqlite3!")
if '"' in file_path:
raise DatabaseCorruptedError(f"Database at path '{file_path}' is corrupted. unable to recover because it has a quotation mark (\") in its name.")
bak_path = f"{file_path}.bak"
shutil.move(file_path, bak_path)
cmd = f"sqlite3 {bak_path} '.clone {file_path}'"
ret = subprocess.call(cmd, shell=True, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
ret = subprocess.call(['sqlite3', bak_path, f'.clone "{file_path}"'],
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if ret != 0:
raise DatabaseCorruptedError("Recovery of database failed")