[Python-checkins] r42883 - in python/trunk: Modules/posixmodule.c Objects/enumobject.c Objects/genobject.c Objects/object.c Objects/stringobject.c Objects/typeobject.c Python/bltinmodule.c Python/exceptions.c Python/import.c Python/marshal.c Python/sysmodule.c
martin.v.loewis
python-checkins at python.org
Tue Mar 7 13:08:53 CET 2006
Author: martin.v.loewis
Date: Tue Mar 7 13:08:51 2006
New Revision: 42883
Modified:
python/trunk/Modules/posixmodule.c
python/trunk/Objects/enumobject.c
python/trunk/Objects/genobject.c
python/trunk/Objects/object.c
python/trunk/Objects/stringobject.c
python/trunk/Objects/typeobject.c
python/trunk/Python/bltinmodule.c
python/trunk/Python/exceptions.c
python/trunk/Python/import.c
python/trunk/Python/marshal.c
python/trunk/Python/sysmodule.c
Log:
Change int to Py_ssize_t in several places.
Add (int) casts to silence compiler warnings.
Raise Python exceptions for overflows.
Modified: python/trunk/Modules/posixmodule.c
==============================================================================
--- python/trunk/Modules/posixmodule.c (original)
+++ python/trunk/Modules/posixmodule.c Tue Mar 7 13:08:51 2006
@@ -2317,9 +2317,9 @@
#if defined(HAVE_EXECV) || defined(HAVE_SPAWNV)
static void
-free_string_array(char **array, int count)
+free_string_array(char **array, Py_ssize_t count)
{
- int i;
+ Py_ssize_t i;
for (i = 0; i < count; i++)
PyMem_Free(array[i]);
PyMem_DEL(array);
@@ -2341,7 +2341,7 @@
char *path;
PyObject *argv;
char **argvlist;
- int i, argc;
+ Py_ssize_t i, argc;
PyObject *(*getitem)(PyObject *, Py_ssize_t);
/* execv has two arguments: (path, argv), where
@@ -2410,7 +2410,7 @@
char **argvlist;
char **envlist;
PyObject *key, *val, *keys=NULL, *vals=NULL;
- int i, pos, argc, envc;
+ Py_ssize_t i, pos, argc, envc;
PyObject *(*getitem)(PyObject *, Py_ssize_t);
int lastarg = 0;
Modified: python/trunk/Objects/enumobject.c
==============================================================================
--- python/trunk/Objects/enumobject.c (original)
+++ python/trunk/Objects/enumobject.c Tue Mar 7 13:08:51 2006
@@ -216,7 +216,7 @@
reversed_next(reversedobject *ro)
{
PyObject *item;
- long index = ro->index;
+ Py_ssize_t index = ro->index;
if (index >= 0) {
item = PySequence_GetItem(ro->seq, index);
Modified: python/trunk/Objects/genobject.c
==============================================================================
--- python/trunk/Objects/genobject.c (original)
+++ python/trunk/Objects/genobject.c Tue Mar 7 13:08:51 2006
@@ -177,7 +177,7 @@
* never happened.
*/
{
- int refcnt = self->ob_refcnt;
+ Py_ssize_t refcnt = self->ob_refcnt;
_Py_NewReference(self);
self->ob_refcnt = refcnt;
}
Modified: python/trunk/Objects/object.c
==============================================================================
--- python/trunk/Objects/object.c (original)
+++ python/trunk/Objects/object.c Tue Mar 7 13:08:51 2006
@@ -1172,7 +1172,7 @@
PyObject **
_PyObject_GetDictPtr(PyObject *obj)
{
- long dictoffset;
+ Py_ssize_t dictoffset;
PyTypeObject *tp = obj->ob_type;
if (!(tp->tp_flags & Py_TPFLAGS_HAVE_CLASS))
@@ -1212,7 +1212,7 @@
PyObject *descr = NULL;
PyObject *res = NULL;
descrgetfunc f;
- long dictoffset;
+ Py_ssize_t dictoffset;
PyObject **dictptr;
if (!PyString_Check(name)){
Modified: python/trunk/Objects/stringobject.c
==============================================================================
--- python/trunk/Objects/stringobject.c (original)
+++ python/trunk/Objects/stringobject.c Tue Mar 7 13:08:51 2006
@@ -3679,6 +3679,7 @@
Py_ssize_t i;
int sign; /* 1 if '-', else 0 */
int len; /* number of characters */
+ Py_ssize_t llen;
int numdigits; /* len == numnondigits + numdigits */
int numnondigits = 0;
@@ -3707,7 +3708,12 @@
return NULL;
}
buf = PyString_AsString(result);
- len = PyString_Size(result);
+ llen = PyString_Size(result);
+ if (llen > INT_MAX) {
+ PyErr_SetString(PyExc_ValueError, "string too large in _PyString_FormatLong");
+ return NULL;
+ }
+ len = (int)llen;
if (buf[len-1] == 'L') {
--len;
buf[len] = '\0';
@@ -3941,12 +3947,12 @@
PyObject *temp = NULL;
char *pbuf;
int sign;
- int len;
+ Py_ssize_t len;
char formatbuf[FORMATBUFLEN];
/* For format{float,int,char}() */
#ifdef Py_USING_UNICODE
char *fmt_start = fmt;
- int argidx_start = argidx;
+ Py_ssize_t argidx_start = argidx;
#endif
fmt++;
@@ -4139,8 +4145,10 @@
if (c == 'i')
c = 'd';
if (PyLong_Check(v)) {
+ int ilen;
temp = _PyString_FormatLong(v, flags,
- prec, c, &pbuf, &len);
+ prec, c, &pbuf, &ilen);
+ len = ilen;
if (!temp)
goto error;
sign = 1;
Modified: python/trunk/Objects/typeobject.c
==============================================================================
--- python/trunk/Objects/typeobject.c (original)
+++ python/trunk/Objects/typeobject.c Tue Mar 7 13:08:51 2006
@@ -4244,7 +4244,8 @@
}
}
else if (! PyErr_Occurred()) {
- result = _PySequence_IterSearch(self, value,
+ /* Possible results: -1 and 1 */
+ result = (int)_PySequence_IterSearch(self, value,
PY_ITERSEARCH_CONTAINS);
}
return result;
@@ -4880,7 +4881,7 @@
* never happened.
*/
{
- int refcnt = self->ob_refcnt;
+ Py_ssize_t refcnt = self->ob_refcnt;
_Py_NewReference(self);
self->ob_refcnt = refcnt;
}
Modified: python/trunk/Python/bltinmodule.c
==============================================================================
--- python/trunk/Python/bltinmodule.c (original)
+++ python/trunk/Python/bltinmodule.c Tue Mar 7 13:08:51 2006
@@ -2514,7 +2514,7 @@
filterunicode(PyObject *func, PyObject *strobj)
{
PyObject *result;
- register int i, j;
+ register Py_ssize_t i, j;
Py_ssize_t len = PyUnicode_GetSize(strobj);
Py_ssize_t outlen = len;
Modified: python/trunk/Python/exceptions.c
==============================================================================
--- python/trunk/Python/exceptions.c (original)
+++ python/trunk/Python/exceptions.c Tue Mar 7 13:08:51 2006
@@ -764,7 +764,7 @@
SyntaxError__init__(PyObject *self, PyObject *args)
{
PyObject *rtnval = NULL;
- int lenargs;
+ Py_ssize_t lenargs;
if (!(self = get_self(args)))
return NULL;
@@ -889,7 +889,7 @@
PyErr_Clear();
if (have_filename || have_lineno) {
- int bufsize = PyString_GET_SIZE(str) + 64;
+ Py_ssize_t bufsize = PyString_GET_SIZE(str) + 64;
if (have_filename)
bufsize += PyString_GET_SIZE(filename);
Modified: python/trunk/Python/import.c
==============================================================================
--- python/trunk/Python/import.c (original)
+++ python/trunk/Python/import.c Tue Mar 7 13:08:51 2006
@@ -853,7 +853,7 @@
/* Now write the true mtime */
fseek(fp, 4L, 0);
assert(mtime < LONG_MAX);
- PyMarshal_WriteLongToFile(mtime, fp, Py_MARSHAL_VERSION);
+ PyMarshal_WriteLongToFile((long)mtime, fp, Py_MARSHAL_VERSION);
fflush(fp);
fclose(fp);
if (Py_VerboseFlag)
@@ -1016,7 +1016,7 @@
PyObject *p)
{
PyObject *importer;
- int j, nhooks;
+ Py_ssize_t j, nhooks;
/* These conditions are the caller's responsibility: */
assert(PyList_Check(path_hooks));
@@ -1075,7 +1075,7 @@
find_module(char *fullname, char *subname, PyObject *path, char *buf,
size_t buflen, FILE **p_fp, PyObject **p_loader)
{
- int i, npath;
+ Py_ssize_t i, npath;
size_t len, namelen;
struct filedescr *fdp = NULL;
char *filemode;
@@ -2028,7 +2028,7 @@
modpath = PyDict_GetItem(globals, pathstr);
if (modpath != NULL) {
- int len = PyString_GET_SIZE(modname);
+ Py_ssize_t len = PyString_GET_SIZE(modname);
if (len > MAXPATHLEN) {
PyErr_SetString(PyExc_ValueError,
"Module name too long");
Modified: python/trunk/Python/marshal.c
==============================================================================
--- python/trunk/Python/marshal.c (original)
+++ python/trunk/Python/marshal.c Tue Mar 7 13:08:51 2006
@@ -186,7 +186,7 @@
n = strlen(buf);
w_byte(TYPE_FLOAT, p);
w_byte((int)n, p);
- w_string(buf, n, p);
+ w_string(buf, (int)n, p);
}
}
#ifndef WITHOUT_COMPLEX
@@ -215,16 +215,16 @@
PyComplex_RealAsDouble(v));
PyFloat_AsReprString(buf, temp);
Py_DECREF(temp);
- n = (int)strlen(buf);
- w_byte(n, p);
- w_string(buf, n, p);
+ n = strlen(buf);
+ w_byte((int)n, p);
+ w_string(buf, (int)n, p);
temp = (PyFloatObject*)PyFloat_FromDouble(
PyComplex_ImagAsDouble(v));
PyFloat_AsReprString(buf, temp);
Py_DECREF(temp);
- n = (int)strlen(buf);
- w_byte(n, p);
- w_string(buf, n, p);
+ n = strlen(buf);
+ w_byte((int)n, p);
+ w_string(buf, (int)n, p);
}
}
#endif
@@ -248,8 +248,14 @@
w_byte(TYPE_STRING, p);
}
n = PyString_GET_SIZE(v);
+ if (n > INT_MAX) {
+ /* huge strings are not supported */
+ p->depth--;
+ p->error = 1;
+ return;
+ }
w_long((long)n, p);
- w_string(PyString_AS_STRING(v), n, p);
+ w_string(PyString_AS_STRING(v), (int)n, p);
}
#ifdef Py_USING_UNICODE
else if (PyUnicode_Check(v)) {
@@ -262,8 +268,13 @@
}
w_byte(TYPE_UNICODE, p);
n = PyString_GET_SIZE(utf8);
+ if (n > INT_MAX) {
+ p->depth--;
+ p->error = 1;
+ return;
+ }
w_long((long)n, p);
- w_string(PyString_AS_STRING(utf8), n, p);
+ w_string(PyString_AS_STRING(utf8), (int)n, p);
Py_DECREF(utf8);
}
#endif
@@ -350,8 +361,13 @@
PyBufferProcs *pb = v->ob_type->tp_as_buffer;
w_byte(TYPE_STRING, p);
n = (*pb->bf_getreadbuffer)(v, 0, (void **)&s);
+ if (n > INT_MAX) {
+ p->depth--;
+ p->error = 1;
+ return;
+ }
w_long((long)n, p);
- w_string(s, n, p);
+ w_string(s, (int)n, p);
}
else {
w_byte(TYPE_UNKNOWN, p);
Modified: python/trunk/Python/sysmodule.c
==============================================================================
--- python/trunk/Python/sysmodule.c (original)
+++ python/trunk/Python/sysmodule.c Tue Mar 7 13:08:51 2006
@@ -597,7 +597,7 @@
static PyObject *
sys_getrefcount(PyObject *self, PyObject *arg)
{
- return PyInt_FromLong(arg->ob_refcnt);
+ return PyInt_FromSsize_t(arg->ob_refcnt);
}
#ifdef Py_REF_DEBUG
More information about the Python-checkins
mailing list