Mailman 3 February 2019 - Python-checkins

closes bpo-13497: Fix `broken nice` configure test. (GH-12041)
by Miss Islington (bot) Feb. 26, 2019

Feb. 26, 2019

https://github.com/python/cpython/commit/a0f656d310bdd08aaaa6f1e186bc7a4174… commit: a0f656d310bdd08aaaa6f1e186bc7a4174e4068f branch: 2.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-02-25T21:54:33-08:00 summary: closes bpo-13497: Fix `broken nice` configure test. (GH-12041) Per POSIX, `nice(3)` requires `unistd.h` and `exit(3)` requires `stdlib.h`. Fixing the test will prevent false … [View More]

1 0

Run autoreconf.
by Benjamin Peterson Feb. 26, 2019

Feb. 26, 2019

https://github.com/python/cpython/commit/b84df2d7cc755b6097cfcd3b1515035844… commit: b84df2d7cc755b6097cfcd3b1515035844590545 branch: master author: Benjamin Peterson <benjamin(a)python.org> committer: Benjamin Peterson <benjamin(a)python.org> date: 2019-02-25T21:37:59-08:00 summary: Run autoreconf. files: M aclocal.m4 M configure M pyconfig.h.in diff --git a/aclocal.m4 b/aclocal.m4 index f98db73656d3..85f00dd5fac7 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,6 +1,6 @@ -# … [View More]generated automatically by aclocal 1.15 -*- Autoconf -*- +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff --git a/configure b/configure index 867e2fc28c47..d98d14ab63f3 100755 --- a/configure +++ b/configure @@ -15542,6 +15542,8 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ +#include <stdlib.h> +#include <unistd.h> int main() { int val1 = nice(1); diff --git a/pyconfig.h.in b/pyconfig.h.in index 8db06d910068..d41d57932766 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -144,18 +144,6 @@ /* Define to 1 if you have the `copysign' function. */ #undef HAVE_COPYSIGN -/* Define to 1 if you must link with -lrt for shm_open(). */ -#undef SHM_NEEDS_LIBRT - -/* Define to 1 if you have the <sys/mman.h> header file. */ -#undef HAVE_SYS_MMAN_H - -/* Define to 1 if you have the shm_open syscall */ -#undef HAVE_SHM_OPEN - -/* Define to 1 if you have the shm_unlink syscall */ -#undef HAVE_SHM_UNLINK - /* Define to 1 if you have the <crypt.h> header file. */ #undef HAVE_CRYPT_H @@ -930,6 +918,12 @@ /* Define to 1 if you have the <shadow.h> header file. */ #undef HAVE_SHADOW_H +/* Define to 1 if you have the `shm_open' function. */ +#undef HAVE_SHM_OPEN + +/* Define to 1 if you have the `shm_unlink' function. */ +#undef HAVE_SHM_UNLINK + /* Define to 1 if you have the `sigaction' function. */ #undef HAVE_SIGACTION @@ -1109,6 +1103,9 @@ /* Define to 1 if you have the <sys/mkdev.h> header file. */ #undef HAVE_SYS_MKDEV_H +/* Define to 1 if you have the <sys/mman.h> header file. */ +#undef HAVE_SYS_MMAN_H + /* Define to 1 if you have the <sys/modem.h> header file. */ #undef HAVE_SYS_MODEM_H @@ -1383,6 +1380,9 @@ /* Define if setpgrp() must be called as setpgrp(0, 0). */ #undef SETPGRP_HAVE_ARG +/* Define to 1 if you must link with -lrt for shm_open(). */ +#undef SHM_NEEDS_LIBRT + /* Define if i>>j for signed int i does not extend the sign bit when i < 0 */ #undef SIGNED_RIGHT_SHIFT_ZERO_FILLS [View Less]

1 0

closes bpo-13497: Fix `broken nice` configure test. (GH-12041)
by Benjamin Peterson Feb. 26, 2019

Feb. 26, 2019

https://github.com/python/cpython/commit/90c6facebd5666fec85f125ee2795b48b3… commit: 90c6facebd5666fec85f125ee2795b48b30319a4 branch: master author: ngie-eign <1574099+ngie-eign(a)users.noreply.github.com> committer: Benjamin Peterson <benjamin(a)python.org> date: 2019-02-25T21:34:24-08:00 summary: closes bpo-13497: Fix `broken nice` configure test. (GH-12041) Per POSIX, `nice(3)` requires `unistd.h` and `exit(3)` requires `stdlib.h`. Fixing the test will prevent false positives … [View More]

1 0

bpo-34791: xml package obeys ignore env flags (GH-9544) (#11871)
by larryhastings Feb. 26, 2019

Feb. 26, 2019

https://github.com/python/cpython/commit/7cd08cf62086a8a2d84fd825dfcd8bfe33… commit: 7cd08cf62086a8a2d84fd825dfcd8bfe33bf1986 branch: 3.5 author: Victor Stinner <vstinner(a)redhat.com> committer: larryhastings <larry(a)hastings.org> date: 2019-02-25T17:47:47-08:00 summary: bpo-34791: xml package obeys ignore env flags (GH-9544) (#11871) The xml.sax and xml.dom.domreg modules now obey sys.flags.ignore_environment. Signed-off-by: Christian Heimes <christian(a)python.org> (… [View More]

1 0

closes bpo-34656: Avoid relying on signed overflow in _pickle memos. (GH-9261) (#11869)
by larryhastings Feb. 26, 2019

Feb. 26, 2019

https://github.com/python/cpython/commit/ef33dd6036aafbd3f06c1d56e2b1a81dae… commit: ef33dd6036aafbd3f06c1d56e2b1a81dae3da63c branch: 3.5 author: Victor Stinner <vstinner(a)redhat.com> committer: larryhastings <larry(a)hastings.org> date: 2019-02-25T16:42:39-08:00 summary: closes bpo-34656: Avoid relying on signed overflow in _pickle memos. (GH-9261) (#11869) (cherry picked from commit a4ae828ee416a66d8c7bf5ee71d653c2cc6a26dd) files: M Modules/_pickle.c diff --git a/Modules/… [View More]_pickle.c b/Modules/_pickle.c index 0f62b1c019c9..fcb9e8789951 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -527,9 +527,9 @@ typedef struct { } PyMemoEntry; typedef struct { - Py_ssize_t mt_mask; - Py_ssize_t mt_used; - Py_ssize_t mt_allocated; + size_t mt_mask; + size_t mt_used; + size_t mt_allocated; PyMemoEntry *mt_table; } PyMemoTable; @@ -573,8 +573,8 @@ typedef struct UnpicklerObject { /* The unpickler memo is just an array of PyObject *s. Using a dict is unnecessary, since the keys are contiguous ints. */ PyObject **memo; - Py_ssize_t memo_size; /* Capacity of the memo array */ - Py_ssize_t memo_len; /* Number of objects in the memo */ + size_t memo_size; /* Capacity of the memo array */ + size_t memo_len; /* Number of objects in the memo */ PyObject *pers_func; /* persistent_load() method, can be NULL. */ @@ -658,7 +658,6 @@ PyMemoTable_New(void) static PyMemoTable * PyMemoTable_Copy(PyMemoTable *self) { - Py_ssize_t i; PyMemoTable *new = PyMemoTable_New(); if (new == NULL) return NULL; @@ -675,7 +674,7 @@ PyMemoTable_Copy(PyMemoTable *self) PyErr_NoMemory(); return NULL; } - for (i = 0; i < self->mt_allocated; i++) { + for (size_t i = 0; i < self->mt_allocated; i++) { Py_XINCREF(self->mt_table[i].me_key); } memcpy(new->mt_table, self->mt_table, @@ -721,7 +720,7 @@ _PyMemoTable_Lookup(PyMemoTable *self, PyObject *key) { size_t i; size_t perturb; - size_t mask = (size_t)self->mt_mask; + size_t mask = self->mt_mask; PyMemoEntry *table = self->mt_table; PyMemoEntry *entry; Py_hash_t hash = (Py_hash_t)key >> 3; @@ -743,22 +742,24 @@ _PyMemoTable_Lookup(PyMemoTable *self, PyObject *key) /* Returns -1 on failure, 0 on success. */ static int -_PyMemoTable_ResizeTable(PyMemoTable *self, Py_ssize_t min_size) +_PyMemoTable_ResizeTable(PyMemoTable *self, size_t min_size) { PyMemoEntry *oldtable = NULL; PyMemoEntry *oldentry, *newentry; - Py_ssize_t new_size = MT_MINSIZE; - Py_ssize_t to_process; + size_t new_size = MT_MINSIZE; + size_t to_process; assert(min_size > 0); - /* Find the smallest valid table size >= min_size. */ - while (new_size < min_size && new_size > 0) - new_size <<= 1; - if (new_size <= 0) { + if (min_size > PY_SSIZE_T_MAX) { PyErr_NoMemory(); return -1; } + + /* Find the smallest valid table size >= min_size. */ + while (new_size < min_size) { + new_size <<= 1; + } /* new_size needs to be a power of two. */ assert((new_size & (new_size - 1)) == 0); @@ -808,6 +809,7 @@ static int PyMemoTable_Set(PyMemoTable *self, PyObject *key, Py_ssize_t value) { PyMemoEntry *entry; + size_t desired_size; assert(key != NULL); @@ -831,10 +833,12 @@ PyMemoTable_Set(PyMemoTable *self, PyObject *key, Py_ssize_t value) * Very large memo tables (over 50K items) use doubling instead. * This may help applications with severe memory constraints. */ - if (!(self->mt_used * 3 >= (self->mt_mask + 1) * 2)) + if (SIZE_MAX / 3 >= self->mt_used && self->mt_used * 3 < self->mt_allocated * 2) { return 0; - return _PyMemoTable_ResizeTable(self, - (self->mt_used > 50000 ? 2 : 4) * self->mt_used); + } + // self->mt_used is always < PY_SSIZE_T_MAX, so this can't overflow. + desired_size = (self->mt_used > 50000 ? 2 : 4) * self->mt_used; + return _PyMemoTable_ResizeTable(self, desired_size); } #undef MT_MINSIZE @@ -1273,9 +1277,9 @@ _Unpickler_Readline(UnpicklerObject *self, char **result) /* Returns -1 (with an exception set) on failure, 0 on success. The memo array will be modified in place. */ static int -_Unpickler_ResizeMemoList(UnpicklerObject *self, Py_ssize_t new_size) +_Unpickler_ResizeMemoList(UnpicklerObject *self, size_t new_size) { - Py_ssize_t i; + size_t i; assert(new_size > self->memo_size); @@ -1292,9 +1296,9 @@ _Unpickler_ResizeMemoList(UnpicklerObject *self, Py_ssize_t new_size) /* Returns NULL if idx is out of bounds. */ static PyObject * -_Unpickler_MemoGet(UnpicklerObject *self, Py_ssize_t idx) +_Unpickler_MemoGet(UnpicklerObject *self, size_t idx) { - if (idx < 0 || idx >= self->memo_size) + if (idx >= self->memo_size) return NULL; return self->memo[idx]; @@ -1303,7 +1307,7 @@ _Unpickler_MemoGet(UnpicklerObject *self, Py_ssize_t idx) /* Returns -1 (with an exception set) on failure, 0 on success. This takes its own reference to `value`. */ static int -_Unpickler_MemoPut(UnpicklerObject *self, Py_ssize_t idx, PyObject *value) +_Unpickler_MemoPut(UnpicklerObject *self, size_t idx, PyObject *value) { PyObject *old_item; @@ -4194,14 +4198,13 @@ static PyObject * _pickle_PicklerMemoProxy_copy_impl(PicklerMemoProxyObject *self) /*[clinic end generated code: output=bb83a919d29225ef input=b73043485ac30b36]*/ { - Py_ssize_t i; PyMemoTable *memo; PyObject *new_memo = PyDict_New(); if (new_memo == NULL) return NULL; memo = self->pickler->memo; - for (i = 0; i < memo->mt_allocated; ++i) { + for (size_t i = 0; i < memo->mt_allocated; ++i) { PyMemoEntry entry = memo->mt_table[i]; if (entry.me_key != NULL) { int status; @@ -6620,7 +6623,7 @@ static PyObject * _pickle_UnpicklerMemoProxy_copy_impl(UnpicklerMemoProxyObject *self) /*[clinic end generated code: output=e12af7e9bc1e4c77 input=97769247ce032c1d]*/ { - Py_ssize_t i; + size_t i; PyObject *new_memo = PyDict_New(); if (new_memo == NULL) return NULL; @@ -6771,8 +6774,7 @@ static int Unpickler_set_memo(UnpicklerObject *self, PyObject *obj) { PyObject **new_memo; - Py_ssize_t new_memo_size = 0; - Py_ssize_t i; + size_t new_memo_size = 0; if (obj == NULL) { PyErr_SetString(PyExc_TypeError, @@ -6789,7 +6791,7 @@ Unpickler_set_memo(UnpicklerObject *self, PyObject *obj) if (new_memo == NULL) return -1; - for (i = 0; i < new_memo_size; i++) { + for (size_t i = 0; i < new_memo_size; i++) { Py_XINCREF(unpickler->memo[i]); new_memo[i] = unpickler->memo[i]; } @@ -6837,8 +6839,7 @@ Unpickler_set_memo(UnpicklerObject *self, PyObject *obj) error: if (new_memo_size) { - i = new_memo_size; - while (--i >= 0) { + for (size_t i = new_memo_size - 1; i != SIZE_MAX; i--) { Py_XDECREF(new_memo[i]); } PyMem_FREE(new_memo); [View Less]

1 0

bpo-35746: Fix segfault in ssl's cert parser (GH-11569) (#11867)
by larryhastings Feb. 26, 2019

Feb. 26, 2019

https://github.com/python/cpython/commit/efec7631edf3b9480dc3988c97ffef94df… commit: efec7631edf3b9480dc3988c97ffef94df8800da branch: 3.5 author: Victor Stinner <vstinner(a)redhat.com> committer: larryhastings <larry(a)hastings.org> date: 2019-02-25T16:17:02-08:00 summary: bpo-35746: Fix segfault in ssl's cert parser (GH-11569) (#11867) Fix a NULL pointer deref in ssl module. The cert parser did not handle CRL distribution points with empty DP or URI correctly. A malicious or … [View More]buggy certificate can result into segfault. Vulnerability (TALOS-2018-0758) reported by Colin Read and Nicolas Edet of Cisco. Signed-off-by: Christian Heimes <christian(a)python.org> (cherry picked from commit a37f52436f9aa4b9292878b72f3ff1480e2606c3) files: A Lib/test/talos-2019-0758.pem A Misc/NEWS.d/next/Security/2019-01-15-18-16-05.bpo-35746.nMSd0j.rst M Lib/test/test_ssl.py M Modules/_ssl.c diff --git a/Lib/test/talos-2019-0758.pem b/Lib/test/talos-2019-0758.pem new file mode 100644 index 000000000000..13b95a77fd8a --- /dev/null +++ b/Lib/test/talos-2019-0758.pem @@ -0,0 +1,22 @@ +-----BEGIN CERTIFICATE----- +MIIDqDCCApKgAwIBAgIBAjALBgkqhkiG9w0BAQswHzELMAkGA1UEBhMCVUsxEDAO +BgNVBAMTB2NvZHktY2EwHhcNMTgwNjE4MTgwMDU4WhcNMjgwNjE0MTgwMDU4WjA7 +MQswCQYDVQQGEwJVSzEsMCoGA1UEAxMjY29kZW5vbWljb24tdm0tMi50ZXN0Lmxh +bC5jaXNjby5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC63fGB +J80A9Av1GB0bptslKRIUtJm8EeEu34HkDWbL6AJY0P8WfDtlXjlPaLqFa6sqH6ES +V48prSm1ZUbDSVL8R6BYVYpOlK8/48xk4pGTgRzv69gf5SGtQLwHy8UPBKgjSZoD +5a5k5wJXGswhKFFNqyyxqCvWmMnJWxXTt2XDCiWc4g4YAWi4O4+6SeeHVAV9rV7C +1wxqjzKovVe2uZOHjKEzJbbIU6JBPb6TRfMdRdYOw98n1VXDcKVgdX2DuuqjCzHP +WhU4Tw050M9NaK3eXp4Mh69VuiKoBGOLSOcS8reqHIU46Reg0hqeL8LIL6OhFHIF +j7HR6V1X6F+BfRS/AgMBAAGjgdYwgdMwCQYDVR0TBAIwADAdBgNVHQ4EFgQUOktp +HQjxDXXUg8prleY9jeLKeQ4wTwYDVR0jBEgwRoAUx6zgPygZ0ZErF9sPC4+5e2Io +UU+hI6QhMB8xCzAJBgNVBAYTAlVLMRAwDgYDVQQDEwdjb2R5LWNhggkA1QEAuwb7 +2s0wCQYDVR0SBAIwADAuBgNVHREEJzAlgiNjb2Rlbm9taWNvbi12bS0yLnRlc3Qu +bGFsLmNpc2NvLmNvbTAOBgNVHQ8BAf8EBAMCBaAwCwYDVR0fBAQwAjAAMAsGCSqG +SIb3DQEBCwOCAQEAvqantx2yBlM11RoFiCfi+AfSblXPdrIrHvccepV4pYc/yO6p +t1f2dxHQb8rWH3i6cWag/EgIZx+HJQvo0rgPY1BFJsX1WnYf1/znZpkUBGbVmlJr +t/dW1gSkNS6sPsM0Q+7HPgEv8CPDNK5eo7vU2seE0iWOkxSyVUuiCEY9ZVGaLVit +p0C78nZ35Pdv4I+1cosmHl28+es1WI22rrnmdBpH8J1eY6WvUw2xuZHLeNVN0TzV +Q3qq53AaCWuLOD1AjESWuUCxMZTK9DPS4JKXTK8RLyDeqOvJGjsSWp3kL0y3GaQ+ +10T1rfkKJub2+m9A9duin1fn6tHc2wSvB7m3DA== +-----END CERTIFICATE----- diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index ffb7314f577c..6c78601b4589 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -69,6 +69,7 @@ def data_file(*name): BADKEY = data_file("badkey.pem") NOKIACERT = data_file("nokia.pem") NULLBYTECERT = data_file("nullbytecert.pem") +TALOS_INVALID_CRLDP = data_file("talos-2019-0758.pem") DHFILE = data_file("dh1024.pem") BYTES_DHFILE = os.fsencode(DHFILE) @@ -252,6 +253,27 @@ def test_parse_cert(self): self.assertEqual(p['crlDistributionPoints'], ('http://SVRIntl-G3-crl.verisign.com/SVRIntlG3.crl',)) + def test_parse_cert_CVE_2019_5010(self): + p = ssl._ssl._test_decode_cert(TALOS_INVALID_CRLDP) + if support.verbose: + sys.stdout.write("\n" + pprint.pformat(p) + "\n") + self.assertEqual( + p, + { + 'issuer': ( + (('countryName', 'UK'),), (('commonName', 'cody-ca'),)), + 'notAfter': 'Jun 14 18:00:58 2028 GMT', + 'notBefore': 'Jun 18 18:00:58 2018 GMT', + 'serialNumber': '02', + 'subject': ((('countryName', 'UK'),), + (('commonName', + 'codenomicon-vm-2.test.lal.cisco.com'),)), + 'subjectAltName': ( + ('DNS', 'codenomicon-vm-2.test.lal.cisco.com'),), + 'version': 3 + } + ) + def test_parse_cert_CVE_2013_4238(self): p = ssl._ssl._test_decode_cert(NULLBYTECERT) if support.verbose: diff --git a/Misc/NEWS.d/next/Security/2019-01-15-18-16-05.bpo-35746.nMSd0j.rst b/Misc/NEWS.d/next/Security/2019-01-15-18-16-05.bpo-35746.nMSd0j.rst new file mode 100644 index 000000000000..fc703b9c2469 --- /dev/null +++ b/Misc/NEWS.d/next/Security/2019-01-15-18-16-05.bpo-35746.nMSd0j.rst @@ -0,0 +1,4 @@ +[CVE-2019-5010] Fix a NULL pointer deref in ssl module. The cert parser did +not handle CRL distribution points with empty DP or URI correctly. A +malicious or buggy certificate can result into segfault. Vulnerability +(TALOS-2018-0758) reported by Colin Read and Nicolas Edet of Cisco. diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 86482677ae7a..f721391d9db9 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -1194,6 +1194,10 @@ _get_crl_dp(X509 *certificate) { STACK_OF(GENERAL_NAME) *gns; dp = sk_DIST_POINT_value(dps, i); + if (dp->distpoint == NULL) { + /* Ignore empty DP value, CVE-2019-5010 */ + continue; + } gns = dp->distpoint->name.fullname; for (j=0; j < sk_GENERAL_NAME_num(gns); j++) { [View Less]

1 0

bpo-24643: Fix "GH-define timezone _timezone" clashes on Windows (GH-12019)
by Miss Islington (bot) Feb. 26, 2019

Feb. 26, 2019

https://github.com/python/cpython/commit/0b3019a02e60171e9b7edb261e12341090… commit: 0b3019a02e60171e9b7edb261e1234109001819c branch: 3.7 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-02-25T16:15:04-08:00 summary: bpo-24643: Fix "GH-define timezone _timezone" clashes on Windows (GH-12019) (cherry picked from commit 6673decfa0fb078f60587f5cb5e98460eea137c2) Co-authored-by: Zackery Spytz <… [View More]zspytz(a)gmail.com> files: A Misc/NEWS.d/next/Windows/2019-02-24-07-52-39.bpo-24643.PofyiS.rst M Modules/timemodule.c M PC/pyconfig.h diff --git a/Misc/NEWS.d/next/Windows/2019-02-24-07-52-39.bpo-24643.PofyiS.rst b/Misc/NEWS.d/next/Windows/2019-02-24-07-52-39.bpo-24643.PofyiS.rst new file mode 100644 index 000000000000..7bc62d8b8fe1 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2019-02-24-07-52-39.bpo-24643.PofyiS.rst @@ -0,0 +1 @@ +Fix name collisions due to ``#define timezone _timezone`` in PC/pyconfig.h. diff --git a/Modules/timemodule.c b/Modules/timemodule.c index bbfb7db7abde..ae7de5b2c766 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -38,6 +38,16 @@ # include <sanitizer/msan_interface.h> #endif +#ifdef _MSC_VER +#define _Py_timezone _timezone +#define _Py_daylight _daylight +#define _Py_tzname _tzname +#else +#define _Py_timezone timezone +#define _Py_daylight daylight +#define _Py_tzname tzname +#endif + #define SEC_TO_NS (1000 * 1000 * 1000) /* Forward declarations */ @@ -1554,18 +1564,18 @@ init_timezone(PyObject *m) #if defined(HAVE_TZNAME) && !defined(__GLIBC__) && !defined(__CYGWIN__) PyObject *otz0, *otz1; tzset(); - PyModule_AddIntConstant(m, "timezone", timezone); + PyModule_AddIntConstant(m, "timezone", _Py_timezone); #ifdef HAVE_ALTZONE PyModule_AddIntConstant(m, "altzone", altzone); #else - PyModule_AddIntConstant(m, "altzone", timezone-3600); + PyModule_AddIntConstant(m, "altzone", _Py_timezone-3600); #endif - PyModule_AddIntConstant(m, "daylight", daylight); - otz0 = PyUnicode_DecodeLocale(tzname[0], "surrogateescape"); + PyModule_AddIntConstant(m, "daylight", _Py_daylight); + otz0 = PyUnicode_DecodeLocale(_Py_tzname[0], "surrogateescape"); if (otz0 == NULL) { return -1; } - otz1 = PyUnicode_DecodeLocale(tzname[1], "surrogateescape"); + otz1 = PyUnicode_DecodeLocale(_Py_tzname[1], "surrogateescape"); if (otz1 == NULL) { Py_DECREF(otz0); return -1; diff --git a/PC/pyconfig.h b/PC/pyconfig.h index bb9171fbcb7d..46fc84e92f29 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -192,13 +192,6 @@ typedef int pid_t; #define Py_IS_FINITE(X) _finite(X) #define copysign _copysign -/* VS 2015 defines these names with a leading underscore */ -#if _MSC_VER >= 1900 -#define timezone _timezone -#define daylight _daylight -#define tzname _tzname -#endif - /* Side by Side assemblies supported in VS 2005 and VS 2008 but not 2010*/ #if _MSC_VER >= 1400 && _MSC_VER < 1600 #define HAVE_SXS 1 [View Less]

1 0

bpo-24643: Fix "#define timezone _timezone" clashes on Windows (GH-12019)
by Steve Dower Feb. 25, 2019

Feb. 25, 2019

https://github.com/python/cpython/commit/6673decfa0fb078f60587f5cb5e98460ee… commit: 6673decfa0fb078f60587f5cb5e98460eea137c2 branch: master author: Zackery Spytz <zspytz(a)gmail.com> committer: Steve Dower <steve.dower(a)microsoft.com> date: 2019-02-25T15:56:44-08:00 summary: bpo-24643: Fix "#define timezone _timezone" clashes on Windows (GH-12019) files: A Misc/NEWS.d/next/Windows/2019-02-24-07-52-39.bpo-24643.PofyiS.rst M Modules/timemodule.c M PC/pyconfig.h diff --git a/Misc/… [View More]NEWS.d/next/Windows/2019-02-24-07-52-39.bpo-24643.PofyiS.rst b/Misc/NEWS.d/next/Windows/2019-02-24-07-52-39.bpo-24643.PofyiS.rst new file mode 100644 index 000000000000..7bc62d8b8fe1 --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2019-02-24-07-52-39.bpo-24643.PofyiS.rst @@ -0,0 +1 @@ +Fix name collisions due to ``#define timezone _timezone`` in PC/pyconfig.h. diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 2e0f08d24a66..7c01cefa4d3c 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -38,6 +38,16 @@ # include <sanitizer/msan_interface.h> #endif +#ifdef _MSC_VER +#define _Py_timezone _timezone +#define _Py_daylight _daylight +#define _Py_tzname _tzname +#else +#define _Py_timezone timezone +#define _Py_daylight daylight +#define _Py_tzname tzname +#endif + #define SEC_TO_NS (1000 * 1000 * 1000) /* Forward declarations */ @@ -1600,18 +1610,18 @@ init_timezone(PyObject *m) #ifdef HAVE_DECL_TZNAME PyObject *otz0, *otz1; tzset(); - PyModule_AddIntConstant(m, "timezone", timezone); + PyModule_AddIntConstant(m, "timezone", _Py_timezone); #ifdef HAVE_ALTZONE PyModule_AddIntConstant(m, "altzone", altzone); #else - PyModule_AddIntConstant(m, "altzone", timezone-3600); + PyModule_AddIntConstant(m, "altzone", _Py_timezone-3600); #endif - PyModule_AddIntConstant(m, "daylight", daylight); - otz0 = PyUnicode_DecodeLocale(tzname[0], "surrogateescape"); + PyModule_AddIntConstant(m, "daylight", _Py_daylight); + otz0 = PyUnicode_DecodeLocale(_Py_tzname[0], "surrogateescape"); if (otz0 == NULL) { return -1; } - otz1 = PyUnicode_DecodeLocale(tzname[1], "surrogateescape"); + otz1 = PyUnicode_DecodeLocale(_Py_tzname[1], "surrogateescape"); if (otz1 == NULL) { Py_DECREF(otz0); return -1; diff --git a/PC/pyconfig.h b/PC/pyconfig.h index 42bbc697aed9..6f8fda66237c 100644 --- a/PC/pyconfig.h +++ b/PC/pyconfig.h @@ -192,13 +192,6 @@ typedef int pid_t; #define Py_IS_FINITE(X) _finite(X) #define copysign _copysign -/* VS 2015 defines these names with a leading underscore */ -#if _MSC_VER >= 1900 -#define timezone _timezone -#define daylight _daylight -#define tzname _tzname -#endif - /* Side by Side assemblies supported in VS 2005 and VS 2008 but not 2010*/ #if _MSC_VER >= 1400 && _MSC_VER < 1600 #define HAVE_SXS 1 [View Less]

1 0

bpo-35411: Skip test_urllib2net FTP tests on Travis CI (GH-10907) (#11874)
by larryhastings Feb. 25, 2019

Feb. 25, 2019

https://github.com/python/cpython/commit/8bcbc7896d1fe1c289bae339d408fdf147… commit: 8bcbc7896d1fe1c289bae339d408fdf1472a00fa branch: 3.5 author: Victor Stinner <vstinner(a)redhat.com> committer: larryhastings <larry(a)hastings.org> date: 2019-02-25T15:16:36-08:00 summary: bpo-35411: Skip test_urllib2net FTP tests on Travis CI (GH-10907) (#11874) On Travis CI, FTP tests of test_urllib2net randomly fail with "425 Security: Bad IP connecting". (cherry picked from commit … [View More]c11b3b19a5b022c6c229043d37f9a9fd06f22500) files: M Lib/test/test_urllib2net.py diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py index 13e2dd5b7842..5e65f615a695 100644 --- a/Lib/test/test_urllib2net.py +++ b/Lib/test/test_urllib2net.py @@ -27,6 +27,13 @@ def wrapped(*args, **kwargs): return _retry_thrice(func, exc, *args, **kwargs) return wrapped +# bpo-35411: FTP tests of test_urllib2net randomly fail +# with "425 Security: Bad IP connecting" on Travis CI +skip_ftp_test_on_travis = unittest.skipIf('TRAVIS' in os.environ, + 'bpo-35411: skip FTP test ' + 'on Travis CI') + + # Connecting to remote hosts is flaky. Make it more robust by retrying # the connection several times. _urlopen_with_retry = _wrap_with_retry_thrice(urllib.request.urlopen, @@ -95,6 +102,7 @@ def setUp(self): # XXX The rest of these tests aren't very good -- they don't check much. # They do sometimes catch some major disasters, though. + @skip_ftp_test_on_travis def test_ftp(self): urls = [ 'ftp://www.pythontest.net/README', @@ -289,6 +297,7 @@ def test_http_timeout(self): FTP_HOST = 'ftp://www.pythontest.net/' + @skip_ftp_test_on_travis def test_ftp_basic(self): self.assertIsNone(socket.getdefaulttimeout()) with support.transient_internet(self.FTP_HOST, timeout=None): @@ -296,6 +305,7 @@ def test_ftp_basic(self): self.addCleanup(u.close) self.assertIsNone(u.fp.fp.raw._sock.gettimeout()) + @skip_ftp_test_on_travis def test_ftp_default_timeout(self): self.assertIsNone(socket.getdefaulttimeout()) with support.transient_internet(self.FTP_HOST): @@ -307,6 +317,7 @@ def test_ftp_default_timeout(self): socket.setdefaulttimeout(None) self.assertEqual(u.fp.fp.raw._sock.gettimeout(), 60) + @skip_ftp_test_on_travis def test_ftp_no_timeout(self): self.assertIsNone(socket.getdefaulttimeout()) with support.transient_internet(self.FTP_HOST): @@ -318,6 +329,7 @@ def test_ftp_no_timeout(self): socket.setdefaulttimeout(None) self.assertIsNone(u.fp.fp.raw._sock.gettimeout()) + @skip_ftp_test_on_travis def test_ftp_timeout(self): with support.transient_internet(self.FTP_HOST): u = _urlopen_with_retry(self.FTP_HOST, timeout=60) [View Less]

1 0

bpo-36102: Prepend slash to all POSIX shared memory block names (#12036)
by Davin Potts Feb. 25, 2019

Feb. 25, 2019

https://github.com/python/cpython/commit/aadef2b41600cb6a4f845cdc4cea001c91… commit: aadef2b41600cb6a4f845cdc4cea001c916d8745 branch: master author: Davin Potts <applio(a)users.noreply.github.com> committer: GitHub <noreply(a)github.com> date: 2019-02-25T16:41:52-06:00 summary: bpo-36102: Prepend slash to all POSIX shared memory block names (#12036) files: M Lib/multiprocessing/shared_memory.py diff --git a/Lib/multiprocessing/shared_memory.py b/Lib/multiprocessing/shared_memory.… [View More]

1 0