summaryrefslogtreecommitdiffstats
path: root/Python
Commit message (Collapse)AuthorAgeFilesLines
* bpo-38106: Fix race in pthread PyThread_release_lock() (GH-16047)Kirill Smelkov2019-10-031-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix race in PyThread_release_lock that was leading to memory corruption and deadlocks. The fix applies to POSIX systems where Python locks are implemented with mutex and condition variable because POSIX semaphores are either not provided, or are known to be broken. One particular example of such system is macOS. On Darwin, even though this is considered as POSIX, Python uses mutex+condition variable to implement its lock, and, as of 2019-08-28, Py2.7 implementation, even though similar issue was fixed for Py3 in 2012, contains synchronization bug: the condition is signalled after mutex unlock while the correct protocol is to signal condition from under mutex: https://github.com/python/cpython/blob/v2.7.16-127-g0229b56d8c0/Python/thread_pthread.h#L486-L506 https://github.com/python/cpython/commit/187aa545165d (py3 fix) PyPy has the same bug for both pypy2 and pypy3: https://bitbucket.org/pypy/pypy/src/578667b3fef9/rpython/translator/c/src/thread_pthread.c#lines-443:465 https://bitbucket.org/pypy/pypy/src/5b42890d48c3/rpython/translator/c/src/thread_pthread.c#lines-443:465 Signalling condition outside of corresponding mutex is considered OK by POSIX, but in Python context it can lead to at least memory corruption if we consider the whole lifetime of python level lock. For example the following logical scenario: T1 T2 sema = Lock() sema.acquire() sema.release() sema.acquire() free(sema) ... can translate to the next C-level calls: T1 T2 # sema = Lock() sema = malloc(...) sema.locked = 0 pthread_mutex_init(&sema.mut) pthread_cond_init (&sema.lock_released) # sema.acquire() pthread_mutex_lock(&sema.mut) # sees sema.locked == 0 sema.locked = 1 pthread_mutex_unlock(&sema.mut) # sema.release() pthread_mutex_lock(&sema.mut) sema.locked = 0 pthread_mutex_unlock(&sema.mut) # OS scheduler gets in and relinquishes control from T2 # to another process ... # second sema.acquire() pthread_mutex_lock(&sema.mut) # sees sema.locked == 0 sema.locked = 1 pthread_mutex_unlock(&sema.mut) # free(sema) pthread_mutex_destroy(&sema.mut) pthread_cond_destroy (&sema.lock_released) free(sema) # ... e.g. malloc() which returns memory where sema was ... # OS scheduler returns control to T2 # sema.release() continues # # BUT sema was already freed and writing to anywhere # inside sema block CORRUPTS MEMORY. In particular if # _another_ python-level lock was allocated where sema # block was, writing into the memory can have effect on # further synchronization correctness and in particular # lead to deadlock on lock that was next allocated. pthread_cond_signal(&sema.lock_released) Note that T2.pthread_cond_signal(&sema.lock_released) CORRUPTS MEMORY as it is called when sema memory was already freed and is potentially reallocated for another object. The fix is to move pthread_cond_signal to be done under corresponding mutex: # sema.release() pthread_mutex_lock(&sema.mut) sema.locked = 0 pthread_cond_signal(&sema.lock_released) pthread_mutex_unlock(&sema.mut) To do so this patch cherry-picks thread_pthread.h part of the following 3.2 commit: commit 187aa545165d8d5eac222ecce29c8a77e0282dd4 Author: Kristján Valur Jónsson <kristjan@ccpgames.com> Date: Tue Jun 5 22:17:42 2012 +0000 Signal condition variables with the mutex held. Destroy condition variables before their mutexes. Python/ceval_gil.h | 9 +++++---- Python/thread_pthread.h | 15 +++++++++------ 2 files changed, 14 insertions(+), 10 deletions(-) (ceval_gil.h is Python3 specific and does not apply to Python2.7) The bug was there since 1994 - since at least [1]. It was discussed in 2001 with original code author[2], but the code was still considered to be race-free. In 2010 the place where pthread_cond_signal should be - before or after pthread_mutex_unlock - was discussed with the rationale to avoid threads bouncing[3,4,5], and in 2012 pthread_cond_signal was moved to be called from under mutex, but only for CPython3[6,7]. In 2019 the bug was (re-)discovered while testing Pygolang[8] on macOS with CPython2 and PyPy2 and PyPy3. [1] https://github.com/python/cpython/commit/2c8cb9f3d240 [2] https://bugs.python.org/issue433625 [3] https://bugs.python.org/issue8299#msg103224 [4] https://bugs.python.org/issue8410#msg103313 [5] https://bugs.python.org/issue8411#msg113301 [6] https://bugs.python.org/issue15038#msg163187 [7] https://github.com/python/cpython/commit/187aa545165d [8] https://pypi.org/project/pygolang (cherry picked from commit 187aa545165d8d5eac222ecce29c8a77e0282dd4) Co-Authored-By: Kristján Valur Jónsson <kristjan@ccpgames.com>
* [2.7] bpo-33006 - Correct filter doc string to clarify 2nd argument can be ↵Tony Flury2019-05-291-5/+6
| | | | | iterable (GH-6015) https://bugs.python.org/issue33006
* bpo-30134: fix BytesWarning doc, docstring and message (GH-12739)Inada Naoki2019-04-091-1/+1
|
* bpo-36262: Fix _Py_dg_strtod() memory leak (goto undfl) (GH-12276) (GH-12332)Victor Stinner2019-03-141-53/+25
| | | | | | | | | | | | | | Fix an unlikely memory leak on conversion from string to float in the function _Py_dg_strtod() used by float(str), complex(str), pickle.load(), marshal.load(), etc. Fix an unlikely memory leak in _Py_dg_strtod() on "undfl:" label: rewrite memory management in this function to always release all memory before exiting the function. Initialize variables to NULL, and set them to NULL after calling Bfree() at the "cont:" label. Note: Bfree(NULL) is well defined: it does nothing. (cherry picked from commit 9776b0636ae39668d3ce1c006d4be01dad01bf9f)
* [2.7] Bump copyright years to 2019. (GH-11408)Benjamin Peterson2019-01-021-1/+1
| | | (cherry picked from commit 9a69ae8a78785105ded02b083b2e5cd2dd939307)
* [2.7] bpo-35441: Remove dead and buggy code related to PyList_SetItem(). ↵Serhiy Storchaka2018-12-192-3/+3
| | | | | | | | | | | | | | (GH-11033) (GH-11234) In _localemodule.c and selectmodule.c, remove dead code that would cause double decrefs if run. In addition, replace PyList_SetItem() with PyList_SET_ITEM() in cases where a new list is populated and there is no possibility of an error. In addition, check if the list changed size in the loop in array_array_fromlist(). (cherry picked from commit 99d56b53560b3867844472ae381fb3f858760621) Co-authored-by: Zackery Spytz <zspytz@gmail.com>
* ceval.c: mark debug 'filename' variable as unused (GH-11074)Victor Stinner2018-12-101-3/+7
| | | | Use GCC __attribute__((unused)) to mark the debug variable 'filename' as unused in Python/ceval.c.
* bpo-33015: Use malloc() in PyThread_start_new_thread() (GH-10829)Victor Stinner2018-11-301-3/+3
| | | | | The pthread implementation of PyThread_start_new_thread() now uses malloc/free rather than PyMem_Malloc/PyMem_Free, since the latters are not thread-safe.
* bpo-33015: Fix UB in pthread PyThread_start_new_thread (GH-6008) (GH-10823)Victor Stinner2018-11-301-4/+36
| | | | | | | | | Fix an undefined behaviour in the pthread implementation of PyThread_start_new_thread(): add a function wrapper to always return NULL. Add pythread_callback struct and pythread_wrapper() to thread_pthread.h. (cherry picked from commit 9eea6eaf23067880f4af3a130e3f67c9812e2f30)
* Add a missed PyErr_NoMemory() in symtable_new(). (GH-10576)Miss Islington (bot)2018-11-161-1/+3
| | | | | | | This missed PyErr_NoMemory() could cause a SystemError when calling _symtable.symtable(). (cherry picked from commit ad65f15581173542f1d2a9968a63bee272510ce3) Co-authored-by: Zackery Spytz <zspytz@gmail.com>
* [2.7] bpo-35133: Fix mistakes when concatenate string literals on different ↵Serhiy Storchaka2018-11-051-1/+1
| | | | | | | | | | | | lines. (GH-10284) (GH-10335) (GH-10336) Two kind of mistakes: 1. Missed space. After concatenating there is no space between words. 2. Missed comma. Causes unintentional concatenating in a list of strings. (cherry picked from commit 34fd4c20198dea6ab2fe8dc6d32d744d9bde868d) (cherry picked from commit 7054e5c80b6e98cd44e22d1bc2d7f0a94343089d)
* Drop confusing commented out code in pystrtod.c (GH-6072) (GH-9588)Victor Stinner2018-09-261-2/+0
| | | | | | | | | Fix the following warning: Python/pystrtod.c: In function 'format_float_short': Python/pystrtod.c:1007:13: warning: 'strncpy' output truncated before terminating nul copying 3 bytes from a string of the same length [-Wstringop-truncation] strncpy(p, "ERR", 3); (cherry picked from commit 9fb84157595a385f15799e5d0729c1e1b0ba9d38)
* bpo-25083: Python can sometimes create incorrect .pyc files (GH-8449)tzickel2018-09-101-0/+3
| | | | | | Python 2 never checked for I/O error when reading .py files and thus could mistake an I/O error for EOF and create incorrect .pyc files. This adds an check for this and aborts on an error.
* [2.7] Issue GH-18560: Fix potential NULL pointer dereference in sum(). (GH-8892)Benjamin Peterson2018-08-241-0/+5
| | | | | (cherry picked from commit 704e2d374f88bca83339b95d559b0abce12dc6bd) Co-authored-by: Christian Heimes <christian@cheimes.de>
* closes bpo-34474: Python/bltinmodule.c: Add missing NULL check in ↵Miss Islington (bot)2018-08-241-0/+5
| | | | | | | | builtin_sum_impl() (GH-8872) Reported by Svace static analyzer. (cherry picked from commit 2b824b2538c4a5f9f520c5de8a1eae5a0c181a94) Co-authored-by: Alexey Izbyshev <izbyshev@ispras.ru>
* [2.7] bpo-34457: Python/ast.c: Add missing NULL check to ↵Alexey Izbyshev2018-08-221-0/+2
| | | | | | | | alias_for_import_name(). (GH-8852) (GH-8858) Reported by Svace static analyzer. (cherry picked from commit 28853a249b1d0c890b7e9ca345290bb8c1756446) Co-authored-by: Alexey Izbyshev <izbyshev@ispras.ru>
* [2.7] bpo-34234: Use _PyAnyInt_Check() and _PyAnyInt_CheckExact(). (GH-8479)Serhiy Storchaka2018-07-314-6/+5
|
* bpo-34080: Fix a memory leak in the compiler. (GH-8222)Miss Islington (bot)2018-07-111-1/+1
| | | | | (cherry picked from commit 993030aac576710a46b3dd0b4864f819d4a94145) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
* [2.7] bpo-23927: Make getargs.c skipitem() skipping 'w*'. (GH-8192). (GH-8255)Serhiy Storchaka2018-07-111-1/+1
| | | | | (cherry picked from commit 504373c59b48f1ea12132d515459022730db6047) Also backport tests for skipitem() and handling errors.
* [2.7] bpo-33330: Improve error handling in PyImport_Cleanup(). (GH-6564). ↵Serhiy Storchaka2018-04-261-8/+30
| | | | | | (GH-6605) (cherry picked from commit e9d9494d6b2a5e0c2d48d22c7f0d5e95504b4f7e)
* [2.7] bpo-33132: Fix reference counting issues in the compiler. (GH-6209). ↵Serhiy Storchaka2018-04-011-18/+19
| | | | | | | (GH-6322) (cherry picked from commit a95d98607efe0c43475b354543e49bf8e240bc6f) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
* Clear possible exception before calling PyTuple_Pack in IMPORT_NAME (GH-6033)Xiang Zhang2018-03-091-1/+8
|
* bpo-32616: Disable computed gotos by default for clang < 5 (GH-5574)INADA Naoki2018-02-071-2/+10
|
* bpo-32674: Improve the docstring for __import__ (GH-5339) (GH-5494)Mariatta2018-02-021-4/+3
| | | | | | | | Clarify that the level argument is used to determine whether to perform absolute or relative imports: 0 is absolute, while a positive number is the number of parent directories to search relative to the current module.. (cherry picked from commit 461d225b195eec5269f317323b41115516144c41) Co-authored-by: oldk <oldk1331@users.noreply.github.com>
* [2.7] advance copyright years to 2018 (GH-5094). (#5105)Benjamin Peterson2018-01-051-1/+1
| | | (cherry picked from commit 65f2a6dcc2bc28a8566b74c8e9273f982331ec48)
* [2.7] bpo-10544: Deprecate "yield" in comprehensions and generator ↵Serhiy Storchaka2017-12-021-17/+71
| | | | expressions in Py3k mode. (GH-4579) (#4676)
* bpo-20891: Fix PyGILState_Ensure() (#4650) (#4657)Victor Stinner2017-11-301-2/+18
| | | | | | | When PyGILState_Ensure() is called in a non-Python thread before PyEval_InitThreads(), only call PyEval_InitThreads() after calling PyThreadState_New() to fix a crash. (cherry picked from commit b4d1e1f7c1af6ae33f0e371576c8bcafedb099db)
* fix marshal uninitialized variable warnings (#4114)Benjamin Peterson2017-10-251-0/+6
| | | | | | | | | | | | | | | | | GCC says: ../cpython/Python/marshal.c: In function ‘PyMarshal_WriteLongToFile’: ../cpython/Python/marshal.c:70:35: warning: ‘wf.ptr’ may be used uninitialized in this function [-Wmaybe-uninitialized] else if ((p)->ptr != (p)->end) *(p)->ptr++ = (c); \ ^~ ../cpython/Python/marshal.c:70:47: warning: ‘wf.end’ may be used uninitialized in this function [-Wmaybe-uninitialized] else if ((p)->ptr != (p)->end) *(p)->ptr++ = (c); \ ^~ ../cpython/Python/marshal.c:77:10: warning: ‘wf.str’ may be used uninitialized in this function [-Wmaybe-uninitialized] if (p->str == NULL) ~^~~~~ This isn't a real problem because if the file pointer is not NULL, the string-related fields are never touched. But, it doesn't hurt to set the unused fields to NULL.
* [2.7] bpo-31692: Add PYTHONSHOWALLOCCOUNT env var (GH-3927)Victor Stinner2017-10-171-1/+3
| | | | | | | | | | | | | | | | bpo-31692, bpo-19527: * Add a new PYTHONSHOWALLOCCOUNT environment variable, similar to the Python 3 "-X showalloccount" option * When Python is compiled with COUNT_ALLOCS, the new PYTHONSHOWALLOCCOUNT environment variable now has to be set to dump allocation counts into stderr on shutdown. Moreover, allocations statistics are now dumped into stderr rather than stdout. * Add @test.support.requires_type_collecting decorator: skip test if COUNT_ALLOCS is defined * Fix tests for COUNT_ALLOCS: decorate some methods with @requires_type_collecting * test_sys.test_objecttypes(): update object type when COUNT_ALLOCS is defined
* bpo-31733: Add PYTHONSHOWREFCOUNT env var (GH-3932)Victor Stinner2017-10-171-10/+17
| | | | | Add a new PYTHONSHOWREFCOUNT environment variable. In debug mode, Python now only print the total reference count if PYTHONSHOWREFCOUNT is set.
* [2.7] remove tabs from getcompiler.c (GH-3892) (#3894)Miss Islington (bot)2017-10-051-1/+1
| | | (cherry picked from commit a8ed11742b4c2115597977ce04fa8e043d9e0792)
* [2.7] bpo-31285: Don't raise a SystemError in warnings.warn_explicit() in ↵Oren Milman2017-09-301-2/+3
| | | | | case __loader__.get_source() has a bad splitlines() method. (GH-3219) (#3823) (cherry picked from commit 91fb0af)
* [2.7] bpo-31411: Prevent raising a SystemError in case warnings.onceregistry ↵Serhiy Storchaka2017-09-111-1/+7
| | | | | is not a dictionary. (GH-3485). (#3493) (cherry picked from commit 252033d50effa08046ac34fcc406bc99796ab88b)
* [2.7] bpo-29526: Add reference to help('FORMATTING') in format() builtin ↵Serhiy Storchaka2017-09-111-1/+3
| | | | | (GH-166). (#3492) (cherry picked from commit 2e6bb4484ee1b0da67d1dfcf0816c58602daa5a0)
* Fix a shadow-compatible-local warning (#2182)Yuan Chao Chou2017-08-041-135/+135
| | | | Change the shadowing naming, 'value' (Python-ast.c:3814), to 'val' to prevent the variables from being misused.
* [2.7] bpo-30765: Avoid blocking when PyThread_acquire_lock() is asked not to ↵Antoine Pitrou2017-06-261-18/+28
| | | | | | | | | | | | | | | | | | (GH-2403) (#2420) * [2.7] bpo-30765: Avoid blocking when PyThread_acquire_lock() is asked not to (GH-2403) * bpo-30765: Avoid blocking when PyThread_acquire_lock() is asked not to lock This is especially important if PyThread_acquire_lock() is called reentrantly (for example from a signal handler). * Update 2017-06-26-14-29-50.bpo-30765.Q5iBmf.rst * Avoid core logic when taking the mutex failed. (cherry picked from commit f84ac420c2af98339678744953869cad3c253281) * Remove test undef
* bpo-23787: Change sum() docstring from sequence to iterable (GH-1859)Mariatta2017-06-061-3/+3
| | | | | * bpo-23787: Change sum() docstring from sequence to iterable Original patch by Raymond Hettinger.
* bpo-30281: Fix the default value for stop in PySlice_Unpack() (#1531) (#1480)Xiang Zhang2017-05-101-1/+1
|
* bpo-27593: Get SCM build info from git instead of hg (#1327)Victor Stinner2017-05-021-3/+3
| | | | | | | | | | | Based on commit 5c4b0d063aba0a68c325073f5f312a2c9f40d178 by Ned Deily, which is based on original patches by Brett Cannon and Steve Dower. Remove also the private _Py_svnversion() function and SVNVERSION variable. Note: Py_SubversionRevision() and Py_SubversionShortBranch() are unchanged, they are part of the public API.
* bpo-29935: Fixed error messages in the index() method of tuple and list ↵Serhiy Storchaka2017-03-301-1/+21
| | | | | | | (#887) (#907) (#910) when pass indices of wrong type. (cherry picked from commit d4edfc9abffca965e76ebc5957a92031a4d6c4d4) (cherry picked from commit bf4bb2e43030661e568d5d4b046e8b9351cc164c)
* bpo-29655: Fixed possible reference leaks in `import *`. (#301) (#510)Serhiy Storchaka2017-03-081-0/+1
| | | | Original patch by Matthias Bussonnier. (cherry picked from commit 160edb43571311a3785785c1dfa784afc52d87be)
* bpo-28598: Support __rmod__ for RHS subclasses of str in % string formatting ↵Xiang Zhang2017-03-011-2/+6
| | | | operations (GH-366)
* Issue #14376: sys.exit now accepts longs as well as ints. Thanks Gareth Rees.Mark Dickinson2017-02-021-1/+1
|
* Don't use getentropy() on LinuxVictor Stinner2017-01-091-2/+9
| | | | | | | Issue #29188: Support glibc 2.24 on Linux: don't use getentropy() function but read from /dev/urandom to get random bytes, for example in os.urandom(). On Linux, getentropy() is implemented which getrandom() is blocking mode, whereas os.urandom() should not block.
* only include sys/random.h if it seems like it might have something useful ↵Benjamin Peterson2017-01-021-1/+1
| | | | (#29057)
* ring in 2017 for PythonBenjamin Peterson2017-01-021-1/+1
|
* add a specific configure check for sys/random.h (closes #28932)Benjamin Peterson2016-12-201-1/+1
|
* Issue #28676: Prevent missing 'getentropy' declaration warning on macOS.Ned Deily2016-11-121-0/+3
| | | | Initial patch by Gareth Rees.
* Issue #28616: Correct help for sys.version_info releaselevel component.Ned Deily2016-11-041-1/+1
| | | | Patch by Anish Tambe.
* Issue #21720: Improve exception message when the type of fromlist is unicodeBerker Peksag2016-10-161-2/+3
|