Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
49226e23
Commit
49226e23
authored
Feb 04, 2017
by
Steve Dower
Browse files
Options
Browse Files
Download
Plain Diff
Issue #29319: Prevent RunMainFromImporter overwriting sys.path[0].
parents
824c6fdf
c008ddeb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
2 deletions
+14
-2
Misc/NEWS
Misc/NEWS
+2
-0
Modules/main.c
Modules/main.c
+12
-2
No files found.
Misc/NEWS
View file @
49226e23
...
...
@@ -10,6 +10,8 @@ What's New in Python 3.7.0 alpha 1?
Core and Builtins
-----------------
- Issue #29319: Prevent RunMainFromImporter overwriting sys.path[0].
- Issue #29337: Fixed possible BytesWarning when compare the code objects.
Warnings could be emitted at compile time.
...
...
Modules/main.c
View file @
49226e23
...
...
@@ -228,7 +228,7 @@ static int RunModule(wchar_t *modname, int set_argv0)
static
int
RunMainFromImporter
(
wchar_t
*
filename
)
{
PyObject
*
argv0
=
NULL
,
*
importer
,
*
sys_path
;
PyObject
*
argv0
=
NULL
,
*
importer
,
*
sys_path
,
*
sys_path0
;
int
sts
;
argv0
=
PyUnicode_FromWideChar
(
filename
,
wcslen
(
filename
));
...
...
@@ -253,7 +253,17 @@ RunMainFromImporter(wchar_t *filename)
PyErr_SetString
(
PyExc_RuntimeError
,
"unable to get sys.path"
);
goto
error
;
}
if
(
PyList_SetItem
(
sys_path
,
0
,
argv0
))
{
sys_path0
=
PyList_GetItem
(
sys_path
,
0
);
sts
=
0
;
if
(
!
sys_path0
)
{
PyErr_Clear
();
sts
=
PyList_Append
(
sys_path
,
argv0
);
}
else
if
(
PyObject_IsTrue
(
sys_path0
))
{
sts
=
PyList_Insert
(
sys_path
,
0
,
argv0
);
}
else
{
sts
=
PyList_SetItem
(
sys_path
,
0
,
argv0
);
}
if
(
sts
)
{
argv0
=
NULL
;
goto
error
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment