Merging upstream version 4.66.4:

- any optional non-boolean CLI arguments are passed through python's eval,
  allowing arbitrary code execution [CVE-2024-34062] (Closes: #1070372).

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-05 19:20:00 +01:00
parent cc4eb343db
commit 10170fb64c
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
18 changed files with 64 additions and 52 deletions

View file

@ -107,7 +107,7 @@ def cpu_timify(t, timer=None):
class UnicodeIO(IOBase):
"""Unicode version of StringIO"""
def __init__(self, *args, **kwargs):
super(UnicodeIO, self).__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
self.encoding = 'U8' # io.StringIO supports unicode, but no encoding
self.text = ''
self.cursor = 0
@ -342,7 +342,7 @@ def test_all_defaults():
class WriteTypeChecker(BytesIO):
"""File-like to assert the expected type is written"""
def __init__(self, expected_type):
super(WriteTypeChecker, self).__init__()
super().__init__()
self.expected_type = expected_type
def write(self, s):
@ -1095,7 +1095,7 @@ def test_custom_format():
"""Provides a `total_time` format parameter"""
@property
def format_dict(self):
d = super(TqdmExtraFormat, self).format_dict
d = super().format_dict
total_time = d["elapsed"] * (d["total"] or 0) / max(d["n"], 1)
d.update(total_time=self.format_interval(total_time) + " in total")
return d