summaryrefslogtreecommitdiffstats
path: root/Objects/stringobject.c
diff options
context:
space:
mode:
Diffstat (limited to 'Objects/stringobject.c')
-rw-r--r--Objects/stringobject.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/Objects/stringobject.c b/Objects/stringobject.c
index 866e7e8..29562a9 100644
--- a/Objects/stringobject.c
+++ b/Objects/stringobject.c
@@ -2678,6 +2678,8 @@ string_encode(PyStringObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "|ss:encode", &encoding, &errors))
return NULL;
v = PyString_AsEncodedObject((PyObject *)self, encoding, errors);
+ if (v == NULL)
+ goto onError;
if (!PyString_Check(v) && !PyUnicode_Check(v)) {
PyErr_Format(PyExc_TypeError,
"encoder did not return a string/unicode object "
@@ -2687,6 +2689,9 @@ string_encode(PyStringObject *self, PyObject *args)
return NULL;
}
return v;
+
+ onError:
+ return NULL;
}
@@ -2710,6 +2715,8 @@ string_decode(PyStringObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "|ss:decode", &encoding, &errors))
return NULL;
v = PyString_AsDecodedObject((PyObject *)self, encoding, errors);
+ if (v == NULL)
+ goto onError;
if (!PyString_Check(v) && !PyUnicode_Check(v)) {
PyErr_Format(PyExc_TypeError,
"decoder did not return a string/unicode object "
@@ -2719,6 +2726,9 @@ string_decode(PyStringObject *self, PyObject *args)
return NULL;
}
return v;
+
+ onError:
+ return NULL;
}