mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-12 11:46:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[3.13] gh-128636: Fix crash in PyREPL when os.environ is overwritten with an invalid value (GH-128653) (#129186)

Browse source 
gh-128636: Fix crash in PyREPL when `os.environ` is overwritten with an invalid value (GH-128653)
(cherry picked from commit ba9a4b6215)

Co-authored-by: Tomas R <tomas.roun8@gmail.com>
This commit is contained in:
Miss Islington (bot) 2025-01-22 17:38:13 +01:00 • committed by GitHub
parent 67971cd605
commit 0b90dc8e89
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/_pyrepl/unix_console.py
View file

@ -449,10 +449,12 @@ class UnixConsole(Console):
"""
try:
return int(os.environ["LINES"]), int(os.environ["COLUMNS"])
except KeyError:
height, width = struct.unpack(
"hhhh", ioctl(self.input_fd, TIOCGWINSZ, b"\000" * 8)
)[0:2]
except (KeyError, TypeError, ValueError):
try:
size = ioctl(self.input_fd, TIOCGWINSZ, b"\000" * 8)
except OSError:
return 25, 80
height, width = struct.unpack("hhhh", size)[0:2]
if not height:
return 25, 80
return height, width
@ -468,7 +470,7 @@ class UnixConsole(Console):
"""
try:
return int(os.environ["LINES"]), int(os.environ["COLUMNS"])
except KeyError:
except (KeyError, TypeError, ValueError):
return 25, 80
def forgetinput(self):