summaryrefslogtreecommitdiff
path: root/Python/thread.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-07-01 22:36:29 -0500
committerBenjamin Peterson <benjamin@python.org>2015-07-01 22:36:29 -0500
commitc6050850b5f399a24702795515d02fdf06b01b4f (patch)
tree516c458f0e3ced865031c0698f3e90ef4c6a45d2 /Python/thread.c
parenta512845231efe72a741ea90c4573ee500a71e21c (diff)
parentc0bde64a372bc70f61a5300b61559ec8c07a06a9 (diff)
downloadcpython-c6050850b5f399a24702795515d02fdf06b01b4f.tar.gz
Merge 3.4
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();