commit cb272843f2d5dfc4ef996ba952b99a3e30c88bbc
author Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Mon Dec 17 07:10:20 2018 -0800
committer GitHub <noreply@github.com> Mon Dec 17 07:10:20 2018 -0800
tree 01fea7a9e86083677614812e0b85b1c8a29732a1
parent c367d52a74781b2c9ffd9e29722fbdfc0234408c

bpo-35504: Fix segfaults and SystemErrors when deleting certain attrs. (GH-11175)

(cherry picked from commit 842acaab1376c5c84fd5966bb6070e289880e1ca)

Co-authored-by: Zackery Spytz <zspytz@gmail.com>

Modules/cjkcodecs/multibytecodec.c

diff --git a/Modules/cjkcodecs/multibytecodec.c b/Modules/cjkcodecs/multibytecodec.c
index 4d0aaf3..5c91ada 100644
--- a/Modules/cjkcodecs/multibytecodec.c
+++ b/Modules/cjkcodecs/multibytecodec.c
@@ -133,6 +133,10 @@
     PyObject *cb;
     const char *str;
 
+    if (value == NULL) {
+        PyErr_SetString(PyExc_AttributeError, "cannot delete attribute");
+        return -1;
+    }
     if (!PyUnicode_Check(value)) {
         PyErr_SetString(PyExc_TypeError, "errors must be a string");
         return -1;