From: Steve Dower <steve.dower@python.org>
Date: Thu, 27 Apr 2023 21:44:07 +0000 (+0100)
Subject: gh-103935: Use `io.open_code()` when executing code in trace and profile modules... 
X-Git-Tag: v3.10.12~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e277266a926a9037d39f1af7751050012f7f1998;p=thirdparty%2FPython%2Fcpython.git

gh-103935: Use `io.open_code()` when executing code in trace and profile modules (GH-103947)

Co-authored-by: Tian Gao <gaogaotiantian@hotmail.com>
---

diff --git a/Lib/cProfile.py b/Lib/cProfile.py
index 22a7d0aade85..9ae1fb8859e5 100755
--- a/Lib/cProfile.py
+++ b/Lib/cProfile.py
@@ -7,6 +7,7 @@
 __all__ = ["run", "runctx", "Profile"]
 
 import _lsprof
+import io
 import profile as _pyprofile
 
 # ____________________________________________________________
@@ -167,7 +168,7 @@ def main():
         else:
             progname = args[0]
             sys.path.insert(0, os.path.dirname(progname))
-            with open(progname, 'rb') as fp:
+            with io.open_code(progname) as fp:
                 code = compile(fp.read(), progname, 'exec')
             globs = {
                 '__file__': progname,
diff --git a/Lib/profile.py b/Lib/profile.py
index d8599fb4eebd..90c4e4c9ff58 100755
--- a/Lib/profile.py
+++ b/Lib/profile.py
@@ -24,6 +24,7 @@
 # governing permissions and limitations under the License.
 
 
+import io
 import sys
 import time
 import marshal
@@ -587,7 +588,7 @@ def main():
         else:
             progname = args[0]
             sys.path.insert(0, os.path.dirname(progname))
-            with open(progname, 'rb') as fp:
+            with io.open_code(progname) as fp:
                 code = compile(fp.read(), progname, 'exec')
             globs = {
                 '__file__': progname,
diff --git a/Lib/trace.py b/Lib/trace.py
index 213e46517d68..fb9a423ea09f 100755
--- a/Lib/trace.py
+++ b/Lib/trace.py
@@ -49,6 +49,7 @@ Sample use, programmatically
 """
 __all__ = ['Trace', 'CoverageResults']
 
+import io
 import linecache
 import os
 import sys
@@ -716,7 +717,7 @@ def main():
             sys.argv = [opts.progname, *opts.arguments]
             sys.path[0] = os.path.dirname(opts.progname)
 
-            with open(opts.progname, 'rb') as fp:
+            with io.open_code(opts.progname) as fp:
                 code = compile(fp.read(), opts.progname, 'exec')
             # try to emulate __main__ namespace as much as possible
             globs = {
diff --git a/Misc/NEWS.d/next/Library/2023-04-27-20-03-08.gh-issue-103935.Uaf2M0.rst b/Misc/NEWS.d/next/Library/2023-04-27-20-03-08.gh-issue-103935.Uaf2M0.rst
new file mode 100644
index 000000000000..71b2d87249c4
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2023-04-27-20-03-08.gh-issue-103935.Uaf2M0.rst
@@ -0,0 +1 @@
+Use :func:`io.open_code` for files to be executed instead of raw :func:`open`