mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 16:39:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

bpo-9566: Fix size_t=>int downcast warnings (#5230)

Browse source 
* Use wider types (int => Py_ssize_t) to avoid integer overflows.
* Fix gc.get_freeze_count(): use Py_ssize_t type rather than int, since gc_list_size() returns a Py_ssize_t.
This commit is contained in:
Victor Stinner 2018-01-18 11:15:25 +01:00 • committed by GitHub
parent ab74504346
commit 05d68a8bd8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Python/ast_opt.c
View file

@ -397,7 +397,7 @@ fold_compare(expr_ty node, PyArena *arena, int optimize)
{
asdl_int_seq *ops;
asdl_seq *args;
int i;
Py_ssize_t i;
ops = node->v.Compare.ops;
args = node->v.Compare.comparators;

4
Python/bltinmodule.c
View file

@ -52,9 +52,9 @@ _Py_IDENTIFIER(stderr);
#include "clinic/bltinmodule.c.h"
static PyObject*
update_bases(PyObject *bases, PyObject *const *args, int nargs)
update_bases(PyObject *bases, PyObject *const *args, Py_ssize_t nargs)
{
int i, j;
Py_ssize_t i, j;
PyObject *base, *meth, *new_base, *result, *new_bases = NULL;
PyObject *stack[1] = {bases};
assert(PyTuple_Check(bases));

8
Python/pathconfig.c
View file

@ -367,13 +367,12 @@ _Py_FindEnvConfigValue(FILE *env_file, const wchar_t *key,
fseek(env_file, 0, SEEK_SET);
while (!feof(env_file)) {
char * p = fgets(buffer, MAXPATHLEN*2, env_file);
wchar_t *tmpbuffer;
int n;
if (p == NULL) {
break;
}
n = strlen(p);
size_t n = strlen(p);
if (p[n - 1] != '\n') {
/* line has overflowed - bail */
break;
@ -382,7 +381,8 @@ _Py_FindEnvConfigValue(FILE *env_file, const wchar_t *key,
/* Comment - skip */
continue;
}
tmpbuffer = _Py_DecodeUTF8_surrogateescape(buffer, n);
wchar_t *tmpbuffer = _Py_DecodeUTF8_surrogateescape(buffer, n);
if (tmpbuffer) {
wchar_t * state;
wchar_t * tok = wcstok(tmpbuffer, L" \t\r\n", &state);