From 0f1f15b0f324512527d4d0eab93057fefd021e05 Mon Sep 17 00:00:00 2001 From: Filipe Fernandes Date: Thu, 24 Sep 2020 18:25:09 -0300 Subject: [PATCH] add off by one patch --- recipe/meta.yaml | 1 + ...rror-in-_winapi_WaitForMultipleObjec.patch | 26 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 recipe/patches/0000-Fix-off-by-one-error-in-_winapi_WaitForMultipleObjec.patch diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 844cb34d8..77eb356fa 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,6 +18,7 @@ source: # md5 from: https://www.python.org/downloads/release/python-385/ md5: 835f3cb29e4065b9a2dea1c7b9bfc37f patches: + - patches/0000-Fix-off-by-one-error-in-_winapi_WaitForMultipleObjec.patch {% if 'conda-forge' not in channel_targets %} - patches/0001-Add-Anaconda-Distribution-version-logic.patch {% endif %} diff --git a/recipe/patches/0000-Fix-off-by-one-error-in-_winapi_WaitForMultipleObjec.patch b/recipe/patches/0000-Fix-off-by-one-error-in-_winapi_WaitForMultipleObjec.patch new file mode 100644 index 000000000..1af14206b --- /dev/null +++ b/recipe/patches/0000-Fix-off-by-one-error-in-_winapi_WaitForMultipleObjec.patch @@ -0,0 +1,26 @@ +From 48755cdaaeb7e4ab82d1b96cc80c0ab67a0c7b0d Mon Sep 17 00:00:00 2001 +From: Ray Donnelly +Date: Sun, 12 Apr 2020 18:22:21 +0200 +Subject: [PATCH 00/26] Fix off-by-one-error in + _winapi_WaitForMultipleObjects_impl + +--- + Modules/_winapi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Modules/_winapi.c b/Modules/_winapi.c +index 647075cdb1..aec836ad82 100644 +--- a/Modules/_winapi.c ++++ b/Modules/_winapi.c +@@ -1706,7 +1706,7 @@ _winapi_WaitForMultipleObjects_impl(PyObject *module, PyObject *handle_seq, + nhandles = PySequence_Length(handle_seq); + if (nhandles == -1) + return NULL; +- if (nhandles < 0 || nhandles >= MAXIMUM_WAIT_OBJECTS - 1) { ++ if (nhandles < 0 || nhandles > MAXIMUM_WAIT_OBJECTS - 1) { + PyErr_Format(PyExc_ValueError, + "need at most %zd handles, got a sequence of length %zd", + MAXIMUM_WAIT_OBJECTS - 1, nhandles); +-- +2.24.3 (Apple Git-128) +