summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-12-09 13:46:18 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-12-09 13:46:18 (GMT)
commit7ec3a3236080dd65a6d949427d206c7cab72d47f (patch)
tree579c4e2a67b16453e831a2c4da4ddc9c93c5d21a
parent24457c9ad375239aca9bd176284d1e4f181e02f4 (diff)
downloadcpython-7ec3a3236080dd65a6d949427d206c7cab72d47f.zip
cpython-7ec3a3236080dd65a6d949427d206c7cab72d47f.tar.gz
cpython-7ec3a3236080dd65a6d949427d206c7cab72d47f.tar.bz2
Issue #16248: Disable code execution from the user's home directory by tkinter when the -E flag is passed to Python.
Patch by Zachary Ware.
-rw-r--r--Lib/tkinter/__init__.py4
-rw-r--r--Misc/NEWS3
2 files changed, 6 insertions, 1 deletions
diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py
index 643026e..67a2f9a 100644
--- a/Lib/tkinter/__init__.py
+++ b/Lib/tkinter/__init__.py
@@ -1698,7 +1698,9 @@ class Tk(Misc, Wm):
self.tk = _tkinter.create(screenName, baseName, className, interactive, wantobjects, useTk, sync, use)
if useTk:
self._loadtk()
- self.readprofile(baseName, className)
+ if not sys.flags.ignore_environment:
+ # Issue #16248: Honor the -E flag to avoid code injection.
+ self.readprofile(baseName, className)
def loadtk(self):
if not self._tkloaded:
self.tk.loadtk()
diff --git a/Misc/NEWS b/Misc/NEWS
index d90b40d..b43799f 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -179,6 +179,9 @@ Core and Builtins
Library
-------
+- Issue #16248: Disable code execution from the user's home directory by
+ tkinter when the -E flag is passed to Python. Patch by Zachary Ware.
+
- Issue #16628: Fix a memory leak in ctypes.resize().
- Issue #13614: Fix setup.py register failure with invalid rst in description.