Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
cpython
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
Batuhan Osman TASKAYA
cpython
Commits
d98646e4
Kaydet (Commit)
d98646e4
authored
Tem 27, 2011
tarafından
Ross Lagerwall
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Issue #12607: In subprocess, fix issue where if stdin, stdout or stderr is
given as a low fd, it gets overwritten.
üst
45686b47
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
76 additions
and
0 deletions
+76
-0
subprocess.py
Lib/subprocess.py
+8
-0
test_subprocess.py
Lib/test/test_subprocess.py
+58
-0
NEWS
Misc/NEWS
+3
-0
_posixsubprocess.c
Modules/_posixsubprocess.c
+7
-0
No files found.
Lib/subprocess.py
Dosyayı görüntüle @
d98646e4
...
@@ -1219,6 +1219,14 @@ class Popen(object):
...
@@ -1219,6 +1219,14 @@ class Popen(object):
os
.
close
(
errread
)
os
.
close
(
errread
)
os
.
close
(
errpipe_read
)
os
.
close
(
errpipe_read
)
# When duping fds, if there arises a situation
# where one of the fds is either 0, 1 or 2, it
# is possible that it is overwritten (#12607).
if
c2pwrite
==
0
:
c2pwrite
=
os
.
dup
(
c2pwrite
)
if
errwrite
==
0
or
errwrite
==
1
:
errwrite
=
os
.
dup
(
errwrite
)
# Dup fds for child
# Dup fds for child
def
_dup2
(
a
,
b
):
def
_dup2
(
a
,
b
):
# dup2() removes the CLOEXEC flag but
# dup2() removes the CLOEXEC flag but
...
...
Lib/test/test_subprocess.py
Dosyayı görüntüle @
d98646e4
...
@@ -1106,6 +1106,64 @@ class POSIXProcessTestCase(BaseTestCase):
...
@@ -1106,6 +1106,64 @@ class POSIXProcessTestCase(BaseTestCase):
for
fd
in
temp_fds
:
for
fd
in
temp_fds
:
os
.
close
(
fd
)
os
.
close
(
fd
)
def
check_swap_fds
(
self
,
stdin_no
,
stdout_no
,
stderr_no
):
# open up some temporary files
temps
=
[
mkstemp
()
for
i
in
range
(
3
)]
temp_fds
=
[
fd
for
fd
,
fname
in
temps
]
try
:
# unlink the files -- we won't need to reopen them
for
fd
,
fname
in
temps
:
os
.
unlink
(
fname
)
# save a copy of the standard file descriptors
saved_fds
=
[
os
.
dup
(
fd
)
for
fd
in
range
(
3
)]
try
:
# duplicate the temp files over the standard fd's 0, 1, 2
for
fd
,
temp_fd
in
enumerate
(
temp_fds
):
os
.
dup2
(
temp_fd
,
fd
)
# write some data to what will become stdin, and rewind
os
.
write
(
stdin_no
,
b
"STDIN"
)
os
.
lseek
(
stdin_no
,
0
,
0
)
# now use those files in the given order, so that subprocess
# has to rearrange them in the child
p
=
subprocess
.
Popen
([
sys
.
executable
,
"-c"
,
'import sys; got = sys.stdin.read();'
'sys.stdout.write("got
%
s"
%
got); sys.stderr.write("err")'
],
stdin
=
stdin_no
,
stdout
=
stdout_no
,
stderr
=
stderr_no
)
p
.
wait
()
for
fd
in
temp_fds
:
os
.
lseek
(
fd
,
0
,
0
)
out
=
os
.
read
(
stdout_no
,
1024
)
err
=
support
.
strip_python_stderr
(
os
.
read
(
stderr_no
,
1024
))
finally
:
for
std
,
saved
in
enumerate
(
saved_fds
):
os
.
dup2
(
saved
,
std
)
os
.
close
(
saved
)
self
.
assertEqual
(
out
,
b
"got STDIN"
)
self
.
assertEqual
(
err
,
b
"err"
)
finally
:
for
fd
in
temp_fds
:
os
.
close
(
fd
)
# When duping fds, if there arises a situation where one of the fds is
# either 0, 1 or 2, it is possible that it is overwritten (#12607).
# This tests all combinations of this.
def
test_swap_fds
(
self
):
self
.
check_swap_fds
(
0
,
1
,
2
)
self
.
check_swap_fds
(
0
,
2
,
1
)
self
.
check_swap_fds
(
1
,
0
,
2
)
self
.
check_swap_fds
(
1
,
2
,
0
)
self
.
check_swap_fds
(
2
,
0
,
1
)
self
.
check_swap_fds
(
2
,
1
,
0
)
def
test_surrogates_error_message
(
self
):
def
test_surrogates_error_message
(
self
):
def
prepare
():
def
prepare
():
raise
ValueError
(
"surrogate:
\uDCff
"
)
raise
ValueError
(
"surrogate:
\uDCff
"
)
...
...
Misc/NEWS
Dosyayı görüntüle @
d98646e4
...
@@ -37,6 +37,9 @@ Core and Builtins
...
@@ -37,6 +37,9 @@ Core and Builtins
Library
Library
-------
-------
- Issue #12607: In subprocess, fix issue where if stdin, stdout or stderr is
given as a low fd, it gets overwritten.
- Issue #12590: IDLE editor window now always displays the first line
- Issue #12590: IDLE editor window now always displays the first line
when opening a long file. With Tk 8.5, the first line was hidden.
when opening a long file. With Tk 8.5, the first line was hidden.
...
...
Modules/_posixsubprocess.c
Dosyayı görüntüle @
d98646e4
...
@@ -69,6 +69,13 @@ static void child_exec(char *const exec_array[],
...
@@ -69,6 +69,13 @@ static void child_exec(char *const exec_array[],
}
}
POSIX_CALL
(
close
(
errpipe_read
));
POSIX_CALL
(
close
(
errpipe_read
));
/* When duping fds, if there arises a situation where one of the fds is
either 0, 1 or 2, it is possible that it is overwritten (#12607). */
if
(
c2pwrite
==
0
)
POSIX_CALL
(
c2pwrite
=
dup
(
c2pwrite
));
if
(
errwrite
==
0
||
errwrite
==
1
)
POSIX_CALL
(
errwrite
=
dup
(
errwrite
));
/* Dup fds for child.
/* Dup fds for child.
dup2() removes the CLOEXEC flag but we must do it ourselves if dup2()
dup2() removes the CLOEXEC flag but we must do it ourselves if dup2()
would be a no-op (issue #10806). */
would be a no-op (issue #10806). */
...
...
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