Merged revisions 78418 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r78418 | eric.smith | 2010-02-24 09:15:36 -0500 (Wed, 24 Feb 2010) | 1 line
Issue #7309: Unchecked pointer access when converting UnicodeEncodeError, UnicodeDecodeError, and UnicodeTranslateError to strings.
........
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index 4f18802..d98dc9c 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -1641,8 +1641,20 @@
UnicodeEncodeError_str(PyObject *self)
{
PyUnicodeErrorObject *uself = (PyUnicodeErrorObject *)self;
+ PyObject *result = NULL;
+ PyObject *reason_str = NULL;
+ PyObject *encoding_str = NULL;
- if (uself->end==uself->start+1) {
+ /* Get reason and encoding as strings, which they might not be if
+ they've been modified after we were contructed. */
+ reason_str = PyObject_Str(uself->reason);
+ if (reason_str == NULL)
+ goto done;
+ encoding_str = PyObject_Str(uself->encoding);
+ if (encoding_str == NULL)
+ goto done;
+
+ if (uself->start < PyUnicode_GET_SIZE(uself->object) && uself->end == uself->start+1) {
int badchar = (int)PyUnicode_AS_UNICODE(uself->object)[uself->start];
char badchar_str[20];
if (badchar <= 0xff)
@@ -1651,21 +1663,25 @@
PyOS_snprintf(badchar_str, sizeof(badchar_str), "u%04x", badchar);
else
PyOS_snprintf(badchar_str, sizeof(badchar_str), "U%08x", badchar);
- return PyString_FromFormat(
+ result = PyString_FromFormat(
"'%.400s' codec can't encode character u'\\%s' in position %zd: %.400s",
- PyString_AS_STRING(uself->encoding),
+ PyString_AS_STRING(encoding_str),
badchar_str,
uself->start,
- PyString_AS_STRING(uself->reason)
- );
+ PyString_AS_STRING(reason_str));
}
- return PyString_FromFormat(
- "'%.400s' codec can't encode characters in position %zd-%zd: %.400s",
- PyString_AS_STRING(uself->encoding),
- uself->start,
- uself->end-1,
- PyString_AS_STRING(uself->reason)
- );
+ else {
+ result = PyString_FromFormat(
+ "'%.400s' codec can't encode characters in position %zd-%zd: %.400s",
+ PyString_AS_STRING(encoding_str),
+ uself->start,
+ uself->end-1,
+ PyString_AS_STRING(reason_str));
+ }
+done:
+ Py_XDECREF(reason_str);
+ Py_XDECREF(encoding_str);
+ return result;
}
static PyTypeObject _PyExc_UnicodeEncodeError = {
@@ -1710,27 +1726,43 @@
UnicodeDecodeError_str(PyObject *self)
{
PyUnicodeErrorObject *uself = (PyUnicodeErrorObject *)self;
+ PyObject *result = NULL;
+ PyObject *reason_str = NULL;
+ PyObject *encoding_str = NULL;
- if (uself->end==uself->start+1) {
+ /* Get reason and encoding as strings, which they might not be if
+ they've been modified after we were contructed. */
+ reason_str = PyObject_Str(uself->reason);
+ if (reason_str == NULL)
+ goto done;
+ encoding_str = PyObject_Str(uself->encoding);
+ if (encoding_str == NULL)
+ goto done;
+
+ if (uself->start < PyUnicode_GET_SIZE(uself->object) && uself->end == uself->start+1) {
/* FromFormat does not support %02x, so format that separately */
char byte[4];
PyOS_snprintf(byte, sizeof(byte), "%02x",
((int)PyString_AS_STRING(uself->object)[uself->start])&0xff);
- return PyString_FromFormat(
+ result = PyString_FromFormat(
"'%.400s' codec can't decode byte 0x%s in position %zd: %.400s",
- PyString_AS_STRING(uself->encoding),
+ PyString_AS_STRING(encoding_str),
byte,
uself->start,
- PyString_AS_STRING(uself->reason)
- );
+ PyString_AS_STRING(reason_str));
}
- return PyString_FromFormat(
- "'%.400s' codec can't decode bytes in position %zd-%zd: %.400s",
- PyString_AS_STRING(uself->encoding),
- uself->start,
- uself->end-1,
- PyString_AS_STRING(uself->reason)
- );
+ else {
+ result = PyString_FromFormat(
+ "'%.400s' codec can't decode bytes in position %zd-%zd: %.400s",
+ PyString_AS_STRING(encoding_str),
+ uself->start,
+ uself->end-1,
+ PyString_AS_STRING(reason_str));
+ }
+done:
+ Py_XDECREF(reason_str);
+ Py_XDECREF(encoding_str);
+ return result;
}
static PyTypeObject _PyExc_UnicodeDecodeError = {
@@ -1795,8 +1827,16 @@
UnicodeTranslateError_str(PyObject *self)
{
PyUnicodeErrorObject *uself = (PyUnicodeErrorObject *)self;
+ PyObject *result = NULL;
+ PyObject *reason_str = NULL;
- if (uself->end==uself->start+1) {
+ /* Get reason as a string, which it might not be if it's been
+ modified after we were contructed. */
+ reason_str = PyObject_Str(uself->reason);
+ if (reason_str == NULL)
+ goto done;
+
+ if (uself->start < PyUnicode_GET_SIZE(uself->object) && uself->end == uself->start+1) {
int badchar = (int)PyUnicode_AS_UNICODE(uself->object)[uself->start];
char badchar_str[20];
if (badchar <= 0xff)
@@ -1805,19 +1845,21 @@
PyOS_snprintf(badchar_str, sizeof(badchar_str), "u%04x", badchar);
else
PyOS_snprintf(badchar_str, sizeof(badchar_str), "U%08x", badchar);
- return PyString_FromFormat(
+ result = PyString_FromFormat(
"can't translate character u'\\%s' in position %zd: %.400s",
badchar_str,
uself->start,
- PyString_AS_STRING(uself->reason)
- );
+ PyString_AS_STRING(reason_str));
+ } else {
+ result = PyString_FromFormat(
+ "can't translate characters in position %zd-%zd: %.400s",
+ uself->start,
+ uself->end-1,
+ PyString_AS_STRING(reason_str));
}
- return PyString_FromFormat(
- "can't translate characters in position %zd-%zd: %.400s",
- uself->start,
- uself->end-1,
- PyString_AS_STRING(uself->reason)
- );
+done:
+ Py_XDECREF(reason_str);
+ return result;
}
static PyTypeObject _PyExc_UnicodeTranslateError = {