summaryrefslogtreecommitdiff
path: root/Python/thread.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-10-06 19:42:02 -0700
committerBenjamin Peterson <benjamin@python.org>2015-10-06 19:42:02 -0700
commitc16b8b405e790c04e4062a4b1231ba56387e4273 (patch)
tree7e6120af47d7413550634e652c8e827603c5c615 /Python/thread.c
parent07929c5f6dd69c554889910bf5988ad6c31f5593 (diff)
parent65e767b0df52dd8262d49f3c1ea1ae3567bb4d47 (diff)
downloadcpython-c16b8b405e790c04e4062a4b1231ba56387e4273.tar.gz
merge 3.4 (#24806)
Diffstat (limited to 'Python/thread.c')
-rw-r--r--Python/thread.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/thread.c b/Python/thread.c
index 4e695aeca2..44c071eafe 100644
--- a/Python/thread.c
+++ b/Python/thread.c
@@ -431,7 +431,7 @@ PyThread_GetInfo(void)
&& defined(_CS_GNU_LIBPTHREAD_VERSION))
value = NULL;
len = confstr(_CS_GNU_LIBPTHREAD_VERSION, buffer, sizeof(buffer));
- if (1 < len && len < sizeof(buffer)) {
+ if (1 < len && (size_t)len < sizeof(buffer)) {
value = PyUnicode_DecodeFSDefaultAndSize(buffer, len-1);
if (value == NULL)
PyErr_Clear();