Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 05:31:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

We had several if statements checking the value of a fd. This is unsafe, since valid fds might be zero. We should check for not None instead.

Browse source
This commit is contained in:
Peter Astrand 2007-02-02 19:06:36 +00:00
parent db67aef672
commit f54000325b
1 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Lib/subprocess.py
View file

@ -592,14 +592,14 @@ def __init__(self, args, bufsize=0, executable=None,
c2pread, c2pwrite, c2pread, c2pwrite,
errread, errwrite) errread, errwrite)
if p2cwrite: if p2cwrite is not None:
self.stdin = os.fdopen(p2cwrite, 'wb', bufsize) self.stdin = os.fdopen(p2cwrite, 'wb', bufsize)
if c2pread: if c2pread is not None:
if universal_newlines: if universal_newlines:
self.stdout = os.fdopen(c2pread, 'rU', bufsize) self.stdout = os.fdopen(c2pread, 'rU', bufsize)
else: else:
self.stdout = os.fdopen(c2pread, 'rb', bufsize) self.stdout = os.fdopen(c2pread, 'rb', bufsize)
if errread: if errread is not None:
if universal_newlines: if universal_newlines:
self.stderr = os.fdopen(errread, 'rU', bufsize) self.stderr = os.fdopen(errread, 'rU', bufsize)
else: else:
@ -986,29 +986,29 @@ def _execute_child(self, args, executable, preexec_fn, close_fds,
# Child # Child
try: try:
# Close parent's pipe ends # Close parent's pipe ends
if p2cwrite: if p2cwrite is not None:
os.close(p2cwrite) os.close(p2cwrite)
if c2pread: if c2pread is not None:
os.close(c2pread) os.close(c2pread)
if errread: if errread is not None:
os.close(errread) os.close(errread)
os.close(errpipe_read) os.close(errpipe_read)
# Dup fds for child # Dup fds for child
if p2cread: if p2cread is not None:
os.dup2(p2cread, 0) os.dup2(p2cread, 0)
if c2pwrite: if c2pwrite is not None:
os.dup2(c2pwrite, 1) os.dup2(c2pwrite, 1)
if errwrite: if errwrite is not None:
os.dup2(errwrite, 2) os.dup2(errwrite, 2)
# Close pipe fds. Make sure we don't close the same # Close pipe fds. Make sure we don't close the same
# fd more than once, or standard fds. # fd more than once, or standard fds.
if p2cread and p2cread not in (0,): if p2cread is not None and p2cread not in (0,):
os.close(p2cread) os.close(p2cread)
if c2pwrite and c2pwrite not in (p2cread, 1): if c2pwrite is not None and c2pwrite not in (p2cread, 1):
os.close(c2pwrite) os.close(c2pwrite)
if errwrite and errwrite not in (p2cread, c2pwrite, 2): if errwrite is not None and errwrite not in (p2cread, c2pwrite, 2):
os.close(errwrite) os.close(errwrite)
# Close all other fds, if asked for # Close all other fds, if asked for
@ -1041,11 +1041,11 @@ def _execute_child(self, args, executable, preexec_fn, close_fds,
# Parent # Parent
os.close(errpipe_write) os.close(errpipe_write)
if p2cread and p2cwrite: if p2cread is not None and p2cwrite is not None:
os.close(p2cread) os.close(p2cread)
if c2pwrite and c2pread: if c2pwrite is not None and c2pread is not None:
os.close(c2pwrite) os.close(c2pwrite)
if errwrite and errread: if errwrite is not None and errread is not None:
os.close(errwrite) os.close(errwrite)
# Wait for exec to fail or succeed; possibly raising exception # Wait for exec to fail or succeed; possibly raising exception