RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #132 from kpcyrd/range-check 

Add range check to generic_select
This commit is contained in:
Anton Hvornum 2021-03-30 14:57:40 +00:00 committed by GitHub
parent bb5caf70b7 40dbb5791c
commit 2c90f02b6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archinstall/lib/user_interaction.py
View File

@ -170,7 +170,10 @@ def generic_select(options, input_text="Select one of the above by index or abso
if len(selected_option.strip()) <= 0: if len(selected_option.strip()) <= 0:
return None return None
elif selected_option.isdigit(): elif selected_option.isdigit():
selected_option = options[int(selected_option)] selected_option = int(selected_option)
if selected_option >= len(options):
raise RequirementError(f'Selected option "{selected_option}" is out of range')
selected_option = options[selected_option]
elif selected_option in options: elif selected_option in options:
pass # We gave a correct absolute value pass # We gave a correct absolute value
else: else:
@ -195,7 +198,10 @@ def select_disk(dict_o_disks):
print(f"{index}: {drive} ({dict_o_disks[drive]['size'], dict_o_disks[drive].device, dict_o_disks[drive]['label']})") print(f"{index}: {drive} ({dict_o_disks[drive]['size'], dict_o_disks[drive].device, dict_o_disks[drive]['label']})")
drive = input('Select one of the above disks (by number or full path): ') drive = input('Select one of the above disks (by number or full path): ')
if drive.isdigit(): if drive.isdigit():
drive = dict_o_disks[drives[int(drive)]] drive = int(drive)
if drive >= len(drives):
raise DiskError(f'Selected option "{drive}" is out of range')
drive = dict_o_disks[drives[drive]]
elif drive in dict_o_disks: elif drive in dict_o_disks:
drive = dict_o_disks[drive] drive = dict_o_disks[drive]
else: else: