traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Issue #1950: Fixed misusage of PyUnicode_AsString().

This commit is contained in:
Alexandre Vassalotti 2008-05-03 18:24:43 +00:00
parent 999679a23e
commit a85998af7c
6 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/datetimemodule.c
View File

@ -1217,10 +1217,9 @@ wrap_strftime(PyObject *object, PyObject *format, PyObject *timetuple,
assert(object && format && timetuple); assert(object && format && timetuple);
assert(PyUnicode_Check(format)); assert(PyUnicode_Check(format));
/* Convert the input format to a C string and size */ /* Convert the input format to a C string and size */
pin = PyUnicode_AsString(format); pin = PyUnicode_AsStringAndSize(format, &flen);
if (!pin) if (!pin)
return NULL; return NULL;
flen = PyUnicode_GetSize(format);
/* Give up if the year is before 1900. /* Give up if the year is before 1900.
* Python strftime() plays games with the year, and different * Python strftime() plays games with the year, and different

14
Modules/parsermodule.c
View File

@ -717,11 +717,10 @@ build_node_children(PyObject *tuple, node *root, int *line_num)
Py_DECREF(o); Py_DECREF(o);
} }
} }
temp_str = PyUnicode_AsString(temp); temp_str = PyUnicode_AsStringAndSize(temp, &len);
len = PyUnicode_GET_SIZE(temp) + 1; strn = (char *)PyObject_MALLOC(len + 1);
strn = (char *)PyObject_MALLOC(len);
if (strn != NULL) if (strn != NULL)
(void) memcpy(strn, temp_str, len); (void) memcpy(strn, temp_str, len + 1);
Py_DECREF(temp); Py_DECREF(temp);
} }
else if (!ISNONTERMINAL(type)) { else if (!ISNONTERMINAL(type)) {
@ -807,11 +806,10 @@ build_node_tree(PyObject *tuple)
if (res && encoding) { if (res && encoding) {
Py_ssize_t len; Py_ssize_t len;
const char *temp; const char *temp;
temp = PyUnicode_AsString(encoding); temp = PyUnicode_AsStringAndSize(encoding, &len);
len = PyUnicode_GET_SIZE(encoding) + 1; res->n_str = (char *)PyObject_MALLOC(len + 1);
res->n_str = (char *)PyObject_MALLOC(len);
if (res->n_str != NULL && temp != NULL) if (res->n_str != NULL && temp != NULL)
(void) memcpy(res->n_str, temp, len); (void) memcpy(res->n_str, temp, len + 1);
Py_DECREF(encoding); Py_DECREF(encoding);
Py_DECREF(tuple); Py_DECREF(tuple);
} }

15
Modules/zipimport.c
View File

@ -61,16 +61,14 @@ static int
zipimporter_init(ZipImporter *self, PyObject *args, PyObject *kwds) zipimporter_init(ZipImporter *self, PyObject *args, PyObject *kwds)
{ {
char *path, *p, *prefix, buf[MAXPATHLEN+2]; char *path, *p, *prefix, buf[MAXPATHLEN+2];
size_t len; Py_ssize_t len;
if (!_PyArg_NoKeywords("zipimporter()", kwds)) if (!_PyArg_NoKeywords("zipimporter()", kwds))
return -1; return -1;
if (!PyArg_ParseTuple(args, "s:zipimporter", if (!PyArg_ParseTuple(args, "s#:zipimporter", &path, &len))
&path))
return -1; return -1;
len = strlen(path);
if (len == 0) { if (len == 0) {
PyErr_SetString(ZipImportError, "archive path is empty"); PyErr_SetString(ZipImportError, "archive path is empty");
return -1; return -1;
@ -329,7 +327,7 @@ zipimporter_load_module(PyObject *obj, PyObject *args)
fullpath = PyUnicode_FromFormat("%s%c%s%s", fullpath = PyUnicode_FromFormat("%s%c%s%s",
PyUnicode_AsString(self->archive), PyUnicode_AsString(self->archive),
SEP, SEP,
*prefix ? prefix : "", prefix ? prefix : "",
subname); subname);
if (fullpath == NULL) if (fullpath == NULL)
goto error; goto error;
@ -388,6 +386,7 @@ zipimporter_get_data(PyObject *obj, PyObject *args)
#endif #endif
PyObject *toc_entry; PyObject *toc_entry;
Py_ssize_t len; Py_ssize_t len;
char *archive_str;
if (!PyArg_ParseTuple(args, "s:zipimporter.get_data", &path)) if (!PyArg_ParseTuple(args, "s:zipimporter.get_data", &path))
return NULL; return NULL;
@ -404,9 +403,9 @@ zipimporter_get_data(PyObject *obj, PyObject *args)
} }
path = buf; path = buf;
#endif #endif
len = PyUnicode_GET_SIZE(self->archive); archive_str = PyUnicode_AsStringAndSize(self->archive, &len);
if ((size_t)len < strlen(path) && if ((size_t)len < strlen(path) &&
strncmp(path, PyUnicode_AsString(self->archive), len) == 0 && strncmp(path, archive_str, len) == 0 &&
path[len] == SEP) { path[len] == SEP) {
path = path + len + 1; path = path + len + 1;
} }
@ -416,7 +415,7 @@ zipimporter_get_data(PyObject *obj, PyObject *args)
PyErr_SetFromErrnoWithFilename(PyExc_IOError, path); PyErr_SetFromErrnoWithFilename(PyExc_IOError, path);
return NULL; return NULL;
} }
return get_data(PyUnicode_AsString(self->archive), toc_entry); return get_data(archive_str, toc_entry);
} }
static PyObject * static PyObject *

21
Objects/typeobject.c
View File

@ -1255,7 +1255,7 @@ check_duplicates(PyObject *list)
if (PyList_GET_ITEM(list, j) == o) { if (PyList_GET_ITEM(list, j) == o) {
o = class_name(o); o = class_name(o);
PyErr_Format(PyExc_TypeError, PyErr_Format(PyExc_TypeError,
"duplicate base class %s", "duplicate base class %.400s",
o ? PyUnicode_AsString(o) : "?"); o ? PyUnicode_AsString(o) : "?");
Py_XDECREF(o); Py_XDECREF(o);
return -1; return -1;
@ -2133,20 +2133,27 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds)
{ {
PyObject *doc = PyDict_GetItemString(dict, "__doc__"); PyObject *doc = PyDict_GetItemString(dict, "__doc__");
if (doc != NULL && PyUnicode_Check(doc)) { if (doc != NULL && PyUnicode_Check(doc)) {
size_t n; Py_ssize_t len;
char *doc_str;
char *tp_doc; char *tp_doc;
const char *str = PyUnicode_AsString(doc);
if (str == NULL) { doc_str = PyUnicode_AsStringAndSize(doc, &len);
if (doc_str == NULL) {
Py_DECREF(type); Py_DECREF(type);
return NULL; return NULL;
} }
n = strlen(str); if ((Py_ssize_t)strlen(doc_str) != len) {
tp_doc = (char *)PyObject_MALLOC(n+1); PyErr_SetString(PyExc_TypeError,
"__doc__ contains null-bytes");
Py_DECREF(type);
return NULL;
}
tp_doc = (char *)PyObject_MALLOC(len + 1);
if (tp_doc == NULL) { if (tp_doc == NULL) {
Py_DECREF(type); Py_DECREF(type);
return NULL; return NULL;
} }
memcpy(tp_doc, str, n+1); memcpy(tp_doc, doc_str, len + 1);
type->tp_doc = tp_doc; type->tp_doc = tp_doc;
} }
} }

13
Python/import.c
View File

@ -2131,13 +2131,15 @@ get_parent(PyObject *globals, char *buf, Py_ssize_t *p_buflen, int level)
if ((pkgname != NULL) && (pkgname != Py_None)) { if ((pkgname != NULL) && (pkgname != Py_None)) {
/* __package__ is set, so use it */ /* __package__ is set, so use it */
char *pkgname_str;
Py_ssize_t len; Py_ssize_t len;
if (!PyUnicode_Check(pkgname)) { if (!PyUnicode_Check(pkgname)) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"__package__ set to non-string"); "__package__ set to non-string");
return NULL; return NULL;
} }
len = PyUnicode_GET_SIZE(pkgname); pkgname_str = PyUnicode_AsStringAndSize(pkgname, &len);
if (len == 0) { if (len == 0) {
if (level > 0) { if (level > 0) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
@ -2151,7 +2153,7 @@ get_parent(PyObject *globals, char *buf, Py_ssize_t *p_buflen, int level)
"Package name too long"); "Package name too long");
return NULL; return NULL;
} }
strcpy(buf, PyUnicode_AsString(pkgname)); strcpy(buf, pkgname_str);
} else { } else {
/* __package__ not set, so figure it out and set it */ /* __package__ not set, so figure it out and set it */
modname = PyDict_GetItem(globals, namestr); modname = PyDict_GetItem(globals, namestr);
@ -2161,14 +2163,17 @@ get_parent(PyObject *globals, char *buf, Py_ssize_t *p_buflen, int level)
modpath = PyDict_GetItem(globals, pathstr); modpath = PyDict_GetItem(globals, pathstr);
if (modpath != NULL) { if (modpath != NULL) {
/* __path__ is set, so modname is already the package name */ /* __path__ is set, so modname is already the package name */
Py_ssize_t len = PyUnicode_GET_SIZE(modname); char *modname_str;
Py_ssize_t len;
int error; int error;
modname_str = PyUnicode_AsStringAndSize(modname, &len);
if (len > MAXPATHLEN) { if (len > MAXPATHLEN) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"Module name too long"); "Module name too long");
return NULL; return NULL;
} }
strcpy(buf, PyUnicode_AsString(modname)); strcpy(buf, modname_str);
error = PyDict_SetItem(globals, pkgstr, modname); error = PyDict_SetItem(globals, pkgstr, modname);
if (error) { if (error) {
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,

17
Python/structmember.c
View File

@ -239,15 +239,22 @@ PyMember_SetOne(char *addr, PyMemberDef *l, PyObject *v)
*(PyObject **)addr = v; *(PyObject **)addr = v;
Py_XDECREF(oldv); Py_XDECREF(oldv);
break; break;
case T_CHAR: case T_CHAR: {
if (PyUnicode_Check(v) && PyUnicode_GetSize(v) == 1) { char *string;
*(char*)addr = PyUnicode_AsString(v)[0]; Py_ssize_t len;
}
else { if (!PyUnicode_Check(v)) {
PyErr_BadArgument(); PyErr_BadArgument();
return -1; return -1;
} }
string = PyUnicode_AsStringAndSize(v, &len);
if (len != 1) {
PyErr_BadArgument();
return -1;
}
*(char*)addr = string[0];
break; break;
}
#ifdef HAVE_LONG_LONG #ifdef HAVE_LONG_LONG
case T_LONGLONG:{ case T_LONGLONG:{
PY_LONG_LONG value; PY_LONG_LONG value;