summaryrefslogtreecommitdiffstats
path: root/Lib/multiprocessing
diff options
context:
space:
mode:
authorRichard Oudkerk <shibturn@gmail.com>2012-08-14 10:41:32 (GMT)
committerRichard Oudkerk <shibturn@gmail.com>2012-08-14 10:41:32 (GMT)
commite88a2445bc31dce0caa0be9b543689a953c1f920 (patch)
treecdb9dc044ec4584b1610e6f03ce995ac4a9f5f75 /Lib/multiprocessing
parent296d1bea6aab9c5cb78ec4f90369352aba64d7c5 (diff)
downloadcpython-e88a2445bc31dce0caa0be9b543689a953c1f920.zip
cpython-e88a2445bc31dce0caa0be9b543689a953c1f920.tar.gz
cpython-e88a2445bc31dce0caa0be9b543689a953c1f920.tar.bz2
Issue #15646: Prevent equivalent of a fork bomb when using multiprocessing
on Windows without the "if __name__ == '__main__'" idiom.
Diffstat (limited to 'Lib/multiprocessing')
-rw-r--r--Lib/multiprocessing/forking.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/multiprocessing/forking.py b/Lib/multiprocessing/forking.py
index 4e24d6a..bc8ac44 100644
--- a/Lib/multiprocessing/forking.py
+++ b/Lib/multiprocessing/forking.py
@@ -331,7 +331,7 @@ else:
'''
Returns prefix of command line used for spawning a child process
'''
- if process.current_process()._identity==() and is_forking(sys.argv):
+ if getattr(process.current_process(), '_inheriting', False):
raise RuntimeError('''
Attempt to start a new process before the current process
has finished its bootstrapping phase.