From 6785534004501e2ba15b0dc4d8dc5ae210ded938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lemburg?= Date: Thu, 8 Jul 2004 19:13:55 +0000 Subject: .encode()/.decode() patch part 2. --- Objects/stringobject.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'Objects/stringobject.c') diff --git a/Objects/stringobject.c b/Objects/stringobject.c index 866e7e84ba..29562a9a8f 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; } -- cgit v1.2.1