summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Lib/test/test_exceptions.py37
-rw-r--r--Misc/NEWS4
-rw-r--r--Objects/exceptions.c114
3 files changed, 119 insertions, 36 deletions
diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index eff552f..8a0f30f 100644
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -398,6 +398,43 @@ class ExceptionTests(unittest.TestCase):
self.assertTrue(unicode(Exception(u'a')))
self.assertTrue(unicode(Exception(u'\xe1')))
+ def testUnicodeChangeAttributes(self):
+ # See issue 7309. This was a crasher.
+
+ u = UnicodeEncodeError('baz', u'xxxxx', 1, 5, 'foo')
+ self.assertEqual(str(u), "'baz' codec can't encode characters in position 1-4: foo")
+ u.end = 2
+ self.assertEqual(str(u), "'baz' codec can't encode character u'\\x78' in position 1: foo")
+ u.end = 5
+ u.reason = 0x345345345345345345
+ self.assertEqual(str(u), "'baz' codec can't encode characters in position 1-4: 965230951443685724997")
+ u.encoding = 4000
+ self.assertEqual(str(u), "'4000' codec can't encode characters in position 1-4: 965230951443685724997")
+ u.start = 1000
+ self.assertEqual(str(u), "'4000' codec can't encode characters in position 1000-4: 965230951443685724997")
+
+ u = UnicodeDecodeError('baz', 'xxxxx', 1, 5, 'foo')
+ self.assertEqual(str(u), "'baz' codec can't decode bytes in position 1-4: foo")
+ u.end = 2
+ self.assertEqual(str(u), "'baz' codec can't decode byte 0x78 in position 1: foo")
+ u.end = 5
+ u.reason = 0x345345345345345345
+ self.assertEqual(str(u), "'baz' codec can't decode bytes in position 1-4: 965230951443685724997")
+ u.encoding = 4000
+ self.assertEqual(str(u), "'4000' codec can't decode bytes in position 1-4: 965230951443685724997")
+ u.start = 1000
+ self.assertEqual(str(u), "'4000' codec can't decode bytes in position 1000-4: 965230951443685724997")
+
+ u = UnicodeTranslateError(u'xxxx', 1, 5, 'foo')
+ self.assertEqual(str(u), "can't translate characters in position 1-4: foo")
+ u.end = 2
+ self.assertEqual(str(u), "can't translate character u'\\x78' in position 1: foo")
+ u.end = 5
+ u.reason = 0x345345345345345345
+ self.assertEqual(str(u), "can't translate characters in position 1-4: 965230951443685724997")
+ u.start = 1000
+ self.assertEqual(str(u), "can't translate characters in position 1000-4: 965230951443685724997")
+
def test_badisinstance(self):
# Bug #2542: if issubclass(e, MyException) raises an exception,
# it should be ignored
diff --git a/Misc/NEWS b/Misc/NEWS
index 715a346..00030c2 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -12,6 +12,10 @@ What's New in Python 2.7 alpha 4?
Core and Builtins
-----------------
+- Issue #7309: Fix unchecked attribute access when converting
+ UnicodeEncodeError, UnicodeDecodeError, and UnicodeTranslateError to
+ strings.
+
- Issue #7649: Fix u'%c' % char for character in range 0x80..0xFF, raise an
UnicodeDecodeError
diff --git a/Objects/exceptions.c b/Objects/exceptions.c
index c246d67..a961143 100644
--- a/Objects/exceptions.c
+++ b/Objects/exceptions.c
@@ -1640,8 +1640,20 @@ static PyObject *
UnicodeEncodeError_str(PyObject *self)
{
PyUnicodeErrorObject *uself = (PyUnicodeErrorObject *)self;
-
- if (uself->end==uself->start+1) {
+ PyObject *result = NULL;
+ PyObject *reason_str = NULL;
+ PyObject *encoding_str = NULL;
+
+ /* 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)
@@ -1650,21 +1662,25 @@ UnicodeEncodeError_str(PyObject *self)
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));
+ }
+ 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));
}
- 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)
- );
+done:
+ Py_XDECREF(reason_str);
+ Py_XDECREF(encoding_str);
+ return result;
}
static PyTypeObject _PyExc_UnicodeEncodeError = {
@@ -1709,27 +1725,43 @@ static PyObject *
UnicodeDecodeError_str(PyObject *self)
{
PyUnicodeErrorObject *uself = (PyUnicodeErrorObject *)self;
-
- if (uself->end==uself->start+1) {
+ PyObject *result = NULL;
+ PyObject *reason_str = NULL;
+ PyObject *encoding_str = NULL;
+
+ /* 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 = {
@@ -1794,8 +1826,16 @@ static PyObject *
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)
@@ -1804,19 +1844,21 @@ UnicodeTranslateError_str(PyObject *self)
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 = {
generated by cgit v0.12 at 2025-02-16 20:28:53 (GMT)