summaryrefslogtreecommitdiff
path: root/Modules/cjkcodecs
diff options
context:
space:
mode:
authorZackery Spytz <zspytz@gmail.com>2018-12-20 10:38:52 -0700
committerSerhiy Storchaka <storchaka@gmail.com>2018-12-20 19:38:52 +0200
commitf347c6eb75ca46990cd7ad3efbe02002603d8460 (patch)
tree744adc5ac41e122e2084d8214cafb4fbc22be2b3 /Modules/cjkcodecs
parent3752bc96c0ea1ecf28903cc34cdcd75c658e92ce (diff)
downloadcpython-git-f347c6eb75ca46990cd7ad3efbe02002603d8460.tar.gz
bpo-35504: Fix segfaults and SystemErrors when deleting certain attrs. (GH-11175) (GH-11249)
(cherry picked from commit 842acaab1376c5c84fd5966bb6070e289880e1ca)
Diffstat (limited to 'Modules/cjkcodecs')
-rw-r--r--Modules/cjkcodecs/multibytecodec.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index 4b482bf9e2..1ad0ea0f51 100644
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -138,6 +138,10 @@ codecctx_errors_set(MultibyteStatefulCodecContext *self, PyObject *value,
{
PyObject *cb;
+ if (value == NULL) {
+ PyErr_SetString(PyExc_AttributeError, "cannot delete attribute");
+ return -1;
+ }
if (!PyString_Check(value)) {
PyErr_SetString(PyExc_TypeError, "errors must be a string");
return -1;