Merge 3.5 (os.urandom, issue #27278)

This commit is contained in:
Victor Stinner 2016-06-14 16:33:17 +02:00
commit 370f5136d4
2 changed files with 5 additions and 1 deletions

View File

@ -10,6 +10,10 @@ What's New in Python 3.6.0 alpha 3
Library Library
------- -------
- Issue #27278: Fix os.urandom() implementation using getrandom() on Linux.
Truncate size to INT_MAX and loop until we collected enough random bytes,
instead of casting a directly Py_ssize_t to int.
- Issue #16864: sqlite3.Cursor.lastrowid now supports REPLACE statement. - Issue #16864: sqlite3.Cursor.lastrowid now supports REPLACE statement.
Initial patch by Alex LordThorsen. Initial patch by Alex LordThorsen.

View File

@ -146,7 +146,7 @@ py_getrandom(void *buffer, Py_ssize_t size, int raise)
to 1024 bytes */ to 1024 bytes */
n = Py_MIN(size, 1024); n = Py_MIN(size, 1024);
#else #else
n = size; n = Py_MIN(size, INT_MAX);
#endif #endif
errno = 0; errno = 0;