2Shirt/WizardKit
2Shirt/WizardKit
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 26 Packages Wiki Activity Actions

Avoid potential crash in run_chkdsk_online()

Browse source
This commit is contained in:
2Shirt 2021-04-17 11:38:06 -06:00
parent 7064472e0b
commit 9351b597c2
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scripts/wk/os/win.py
View file

@ -338,16 +338,26 @@ def run_chkdsk_online():
# Run scan # Run scan
run_program(cmd, check=False) run_program(cmd, check=False)
proc = get_procs('chkdsk.exe')[0] try:
return_code = proc.wait() proc = get_procs('chkdsk.exe')[0]
return_code = proc.wait()
except IndexError:
# Failed to get CHKDSK process, set return_code to force a retry
return_code = 255
if return_code > 1: if return_code > 1:
# Try again # Try again
retried = True retried = True
run_program(cmd, check=False) run_program(cmd, check=False)
proc = get_procs('chkdsk.exe')[0] try:
return_code = proc.wait() proc = get_procs('chkdsk.exe')[0]
return_code = proc.wait()
except IndexError:
# Failed to get CHKDSK process
return_code = -1
# Check result # Check result
if return_code == -1:
raise GenericError('Failed to find CHKDSK process.')
if (return_code == 0 and retried) or return_code == 1: if (return_code == 0 and retried) or return_code == 1:
raise GenericWarning('Repaired (or manually aborted)') raise GenericWarning('Repaired (or manually aborted)')
if return_code > 1: if return_code > 1: