mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 02:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Trent Mick's Win64 changes: size_t vs. int or long; also some overflow

Browse source 
tests.
This commit is contained in:
Guido van Rossum 2000-06-28 22:07:35 +00:00
parent 6f2a5efec9
commit 582acece2e
9 changed files with 40 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Python/traceback.c
View file

@ -166,7 +166,7 @@ tb_displayline(f, filename, lineno, name)
path = PySys_GetObject("path");
if (path != NULL && PyList_Check(path)) {
int npath = PyList_Size(path);
int taillen = strlen(tail);
size_t taillen = strlen(tail);
char namebuf[MAXPATHLEN+1];
for (i = 0; i < npath; i++) {
PyObject *v = PyList_GetItem(path, i);
@ -175,12 +175,12 @@ tb_displayline(f, filename, lineno, name)
break;
}
if (PyString_Check(v)) {
int len;
size_t len;
len = PyString_Size(v);
if (len + 1 + taillen >= MAXPATHLEN)
continue; /* Too long */
strcpy(namebuf, PyString_AsString(v));
if ((int)strlen(namebuf) != len)
if (strlen(namebuf) != len)
continue; /* v contains '\0' */
if (len > 0 && namebuf[len-1] != SEP)
namebuf[len++] = SEP;