mirrors/cpython
mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-21 21:09:37 +01:00
Code Issues Releases Activity

gh-126433: Fix compiler warnings on 32-bit Windows (#126444)

Browse Source
This commit is contained in:
Victor Stinner 2024-11-05 16:05:13 +01:00 committed by GitHub
parent bbfd9c92fa
commit 0b67ce930a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/_interpchannelsmodule.c
View File

@ -2061,7 +2061,7 @@ _channel_get_info(_channels *channels, int64_t cid, struct channel_info *info)
if (interp == NULL) { if (interp == NULL) {
return -1; return -1;
} }
Py_ssize_t interpid = PyInterpreterState_GetID(interp); int64_t interpid = PyInterpreterState_GetID(interp);
// Hold the global lock until we're done. // Hold the global lock until we're done.
PyThread_acquire_lock(channels->mutex, WAIT_LOCK); PyThread_acquire_lock(channels->mutex, WAIT_LOCK);

6
Modules/_ssl.c
View File

@ -4923,7 +4923,9 @@ static unsigned int psk_client_callback(SSL *s,
goto error; goto error;
} }
if (identity_len_ + 1 > max_identity_len || psk_len_ > max_psk_len) { if ((size_t)identity_len_ + 1 > max_identity_len
|| (size_t)psk_len_ > max_psk_len)
{
Py_DECREF(result); Py_DECREF(result);
goto error; goto error;
} }
@ -5036,7 +5038,7 @@ static unsigned int psk_server_callback(SSL *s,
goto error; goto error;
} }
if (psk_len_ > max_psk_len) { if ((size_t)psk_len_ > max_psk_len) {
Py_DECREF(result); Py_DECREF(result);
goto error; goto error;
} }

6
Modules/_winapi.c
View File

@ -2317,7 +2317,7 @@ _winapi_BatchedWaitForMultipleObjects_impl(PyObject *module,
BOOL wait_all, DWORD milliseconds) BOOL wait_all, DWORD milliseconds)
/*[clinic end generated code: output=d21c1a4ad0a252fd input=7e196f29005dc77b]*/ /*[clinic end generated code: output=d21c1a4ad0a252fd input=7e196f29005dc77b]*/
{ {
Py_ssize_t thread_count = 0, handle_count = 0, i, j; Py_ssize_t thread_count = 0, handle_count = 0, i;
Py_ssize_t nhandles; Py_ssize_t nhandles;
BatchedWaitData *thread_data[MAXIMUM_WAIT_OBJECTS]; BatchedWaitData *thread_data[MAXIMUM_WAIT_OBJECTS];
HANDLE handles[MAXIMUM_WAIT_OBJECTS]; HANDLE handles[MAXIMUM_WAIT_OBJECTS];
@ -2378,7 +2378,7 @@ _winapi_BatchedWaitForMultipleObjects_impl(PyObject *module,
if (data->handle_count > MAXIMUM_WAIT_OBJECTS - 1) { if (data->handle_count > MAXIMUM_WAIT_OBJECTS - 1) {
data->handle_count = MAXIMUM_WAIT_OBJECTS - 1; data->handle_count = MAXIMUM_WAIT_OBJECTS - 1;
} }
for (j = 0; j < data->handle_count; ++i, ++j) { for (DWORD j = 0; j < data->handle_count; ++i, ++j) {
PyObject *v = PySequence_GetItem(handle_seq, i); PyObject *v = PySequence_GetItem(handle_seq, i);
if (!v || !PyArg_Parse(v, F_HANDLE, &data->handles[j])) { if (!v || !PyArg_Parse(v, F_HANDLE, &data->handles[j])) {
Py_XDECREF(v); Py_XDECREF(v);
@ -2526,7 +2526,7 @@ _winapi_BatchedWaitForMultipleObjects_impl(PyObject *module,
if (triggered_indices) { if (triggered_indices) {
for (i = 0; i < thread_count; ++i) { for (i = 0; i < thread_count; ++i) {
Py_ssize_t triggered = (Py_ssize_t)thread_data[i]->result - WAIT_OBJECT_0; Py_ssize_t triggered = (Py_ssize_t)thread_data[i]->result - WAIT_OBJECT_0;
if (triggered >= 0 && triggered < thread_data[i]->handle_count - 1) { if (triggered >= 0 && (size_t)triggered < thread_data[i]->handle_count - 1) {
PyObject *v = PyLong_FromSsize_t(thread_data[i]->handle_base + triggered); PyObject *v = PyLong_FromSsize_t(thread_data[i]->handle_base + triggered);
if (!v || PyList_Append(triggered_indices, v) < 0) { if (!v || PyList_Append(triggered_indices, v) < 0) {
Py_XDECREF(v); Py_XDECREF(v);

6
Modules/blake2module.c
View File

@ -474,7 +474,7 @@ py_blake2b_or_s_new(PyTypeObject *type, PyObject *data, int digest_size,
/* Validate salt parameter. */ /* Validate salt parameter. */
if ((salt->obj != NULL) && salt->len) { if ((salt->obj != NULL) && salt->len) {
if (salt->len > (is_blake2b(self->impl) ? HACL_HASH_BLAKE2B_SALT_BYTES : HACL_HASH_BLAKE2S_SALT_BYTES)) { if ((size_t)salt->len > (is_blake2b(self->impl) ? HACL_HASH_BLAKE2B_SALT_BYTES : HACL_HASH_BLAKE2S_SALT_BYTES)) {
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"maximum salt length is %d bytes", "maximum salt length is %d bytes",
(is_blake2b(self->impl) ? HACL_HASH_BLAKE2B_SALT_BYTES : HACL_HASH_BLAKE2S_SALT_BYTES)); (is_blake2b(self->impl) ? HACL_HASH_BLAKE2B_SALT_BYTES : HACL_HASH_BLAKE2S_SALT_BYTES));
@ -485,7 +485,7 @@ py_blake2b_or_s_new(PyTypeObject *type, PyObject *data, int digest_size,
/* Validate personalization parameter. */ /* Validate personalization parameter. */
if ((person->obj != NULL) && person->len) { if ((person->obj != NULL) && person->len) {
if (person->len > (is_blake2b(self->impl) ? HACL_HASH_BLAKE2B_PERSONAL_BYTES : HACL_HASH_BLAKE2S_PERSONAL_BYTES)) { if ((size_t)person->len > (is_blake2b(self->impl) ? HACL_HASH_BLAKE2B_PERSONAL_BYTES : HACL_HASH_BLAKE2S_PERSONAL_BYTES)) {
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"maximum person length is %d bytes", "maximum person length is %d bytes",
(is_blake2b(self->impl) ? HACL_HASH_BLAKE2B_PERSONAL_BYTES : HACL_HASH_BLAKE2S_PERSONAL_BYTES)); (is_blake2b(self->impl) ? HACL_HASH_BLAKE2B_PERSONAL_BYTES : HACL_HASH_BLAKE2S_PERSONAL_BYTES));
@ -534,7 +534,7 @@ py_blake2b_or_s_new(PyTypeObject *type, PyObject *data, int digest_size,
/* Set key length. */ /* Set key length. */
if ((key->obj != NULL) && key->len) { if ((key->obj != NULL) && key->len) {
if (key->len > (is_blake2b(self->impl) ? HACL_HASH_BLAKE2B_KEY_BYTES : HACL_HASH_BLAKE2S_KEY_BYTES)) { if ((size_t)key->len > (is_blake2b(self->impl) ? HACL_HASH_BLAKE2B_KEY_BYTES : HACL_HASH_BLAKE2S_KEY_BYTES)) {
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"maximum key length is %d bytes", "maximum key length is %d bytes",
(is_blake2b(self->impl) ? HACL_HASH_BLAKE2B_KEY_BYTES : HACL_HASH_BLAKE2S_KEY_BYTES)); (is_blake2b(self->impl) ? HACL_HASH_BLAKE2B_KEY_BYTES : HACL_HASH_BLAKE2S_KEY_BYTES));

2
PC/venvlauncher.c
View File

@ -223,7 +223,7 @@ find_home_value(const char *buffer, DWORD maxlen, const char **start, DWORD *len
return 0; return 0;
} }
for (const char *s = strstr(buffer, "home"); for (const char *s = strstr(buffer, "home");
s && ((ptrdiff_t)s - (ptrdiff_t)buffer) < maxlen; s && (size_t)((ptrdiff_t)s - (ptrdiff_t)buffer) < maxlen;
s = strstr(s + 1, "\nhome") s = strstr(s + 1, "\nhome")
) { ) {
if (*s == '\n') { if (*s == '\n') {