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>

Objects/frameobject.c

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index 4ef10d0..4362615 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -90,6 +90,10 @@
     int blockstack_top = 0;             /* (ditto) */
     unsigned char setup_op = 0;         /* (ditto) */
 
+    if (p_new_lineno == NULL) {
+        PyErr_SetString(PyExc_AttributeError, "cannot delete attribute");
+        return -1;
+    }
     /* f_lineno must be an integer. */
     if (!PyLong_CheckExact(p_new_lineno)) {
         PyErr_SetString(PyExc_ValueError,