diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2012-12-09 13:46:46 (GMT) |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2012-12-09 13:46:46 (GMT) |
| commit | 373528f6b1d29a862189504384f31596ad4304d4 (patch) | |
| tree | a5ec192c655284950df9c0c3f70483976d7c75b2 | |
| parent | 0eee97cce64c3438f11bf2bf1e8944345254aa50 (diff) | |
| parent | 7ec3a3236080dd65a6d949427d206c7cab72d47f (diff) | |
| download | cpython-373528f6b1d29a862189504384f31596ad4304d4.zip cpython-373528f6b1d29a862189504384f31596ad4304d4.tar.gz cpython-373528f6b1d29a862189504384f31596ad4304d4.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__.py | 4 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Lib/tkinter/__init__.py b/Lib/tkinter/__init__.py index 763a25d..0ef62de 100644 --- a/Lib/tkinter/__init__.py +++ b/Lib/tkinter/__init__.py @@ -1756,7 +1756,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() @@ -108,6 +108,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. |