Skip to content

Commit

Permalink
yes: deal with UnicodeDecodeError in input(), fixes #6984
Browse files Browse the repository at this point in the history
if retry is True, it will just retry to get a valid answer.
if retry is False, it will return the default.

the code can be tested by entering "error" (without the quotes).
  • Loading branch information
ThomasWaldmann committed Dec 24, 2024
1 parent d94b954 commit f056403
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion src/borg/helpers/yes.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
TRUISH = ('Yes', 'YES', 'yes', 'Y', 'y', '1', )
DEFAULTISH = ('Default', 'DEFAULT', 'default', 'D', 'd', '', )

ERROR = "error"
assert ERROR not in TRUISH + FALSISH + DEFAULTISH


def yes(msg=None, false_msg=None, true_msg=None, default_msg=None,
retry_msg=None, invalid_msg=None, env_msg='{} (from {})',
Expand Down Expand Up @@ -77,10 +80,14 @@ def output(msg, msg_type, is_prompt=False, **kwargs):
if not prompt:
return default
try:
answer = input()
answer = input() # this may raise UnicodeDecodeError, #6984
if answer == ERROR: # for testing purposes
raise UnicodeDecodeError("?", b"?", 0, 1, "?") # args don't matter

Check warning on line 85 in src/borg/helpers/yes.py

View check run for this annotation

Codecov / codecov/patch

src/borg/helpers/yes.py#L85

Added line #L85 was not covered by tests
except EOFError:
# avoid defaultish[0], defaultish could be empty
answer = truish[0] if default else falsish[0]
except UnicodeDecodeError:
answer = ERROR

Check warning on line 90 in src/borg/helpers/yes.py

View check run for this annotation

Codecov / codecov/patch

src/borg/helpers/yes.py#L89-L90

Added lines #L89 - L90 were not covered by tests
if answer in defaultish:
if default_msg:
output(default_msg, 'accepted_default')
Expand Down

0 comments on commit f056403

Please sign in to comment.