diff options
author | Armin Rigo <arigo@tunes.org> | 2006-10-04 11:44:06 (GMT) |
---|---|---|
committer | Armin Rigo <arigo@tunes.org> | 2006-10-04 11:44:06 (GMT) |
commit | 4b63c21d6faebc406260733c16b826e3e01b0d89 (patch) | |
tree | bdeaa6389ccc7075550272904869d32302046572 /Python/sysmodule.c | |
parent | c6f2f884b4789c4000ffb30a85646f088da102b1 (diff) | |
download | cpython-4b63c21d6faebc406260733c16b826e3e01b0d89.zip cpython-4b63c21d6faebc406260733c16b826e3e01b0d89.tar.gz cpython-4b63c21d6faebc406260733c16b826e3e01b0d89.tar.bz2 |
Forward-port of r52136: a review of overflow-detecting code.
* unified the way intobject, longobject and mystrtoul handle
values around -sys.maxint-1.
* in general, trying to entierely avoid overflows in any computation
involving signed ints or longs is extremely involved. Fixed a few
simple cases where a compiler might be too clever (but that's all
guesswork).
* more overflow checks against bad data in marshal.c.
* 2.5 specific: fixed a number of places that were still confusing int
and Py_ssize_t. Some of them could potentially have caused
"real-world" breakage.
* list.pop(x): fixing overflow issues on x was messy. I just reverted
to PyArg_ParseTuple("n"), which does the right thing. (An obscure
test was trying to give a Decimal to list.pop()... doesn't make
sense any more IMHO)
* trying to write a few tests...
Diffstat (limited to 'Python/sysmodule.c')
-rw-r--r-- | Python/sysmodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/sysmodule.c b/Python/sysmodule.c index 2dbe283..6fbaba50 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -1225,7 +1225,7 @@ makepathobject(char *path, int delim) p = strchr(path, delim); if (p == NULL) p = strchr(path, '\0'); /* End of string */ - w = PyString_FromStringAndSize(path, (int) (p - path)); + w = PyString_FromStringAndSize(path, (Py_ssize_t) (p - path)); if (w == NULL) { Py_DECREF(v); return NULL; |