From c60589c02b998794837489a6c6e51c4723af097f Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Sun, 25 Mar 2018 16:13:49 -0500
Subject: [PATCH] py/objtype: Fix assertion failures in super_attr by checking
 type.

Fixes assertion failures and segmentation faults when making calls like:

    super(1, 1).x
---
 py/objtype.c                | 3 +++
 tests/basics/class_super.py | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/py/objtype.c b/py/objtype.c
index 9b57a50517..77810ce707 100644
--- a/py/objtype.c
+++ b/py/objtype.c
@@ -1112,6 +1112,9 @@ STATIC mp_obj_t super_make_new(const mp_obj_type_t *type_in, size_t n_args, size
     // 0 arguments are turned into 2 in the compiler
     // 1 argument is not yet implemented
     mp_arg_check_num(n_args, n_kw, 2, 2, false);
+    if (!MP_OBJ_IS_TYPE(args[0], &mp_type_type)) {
+        mp_raise_TypeError(NULL);
+    }
     mp_obj_super_t *o = m_new_obj(mp_obj_super_t);
     *o = (mp_obj_super_t){{type_in}, args[0], args[1]};
     return MP_OBJ_FROM_PTR(o);
diff --git a/tests/basics/class_super.py b/tests/basics/class_super.py
index 698fe5dff2..b6ee68308a 100644
--- a/tests/basics/class_super.py
+++ b/tests/basics/class_super.py
@@ -35,6 +35,12 @@ class B(A):
         return super().foo().count(2) # calling a subsequent method
 print(B().foo())
 
+# first arg to super must be a type
+try:
+    super(1, 1)
+except TypeError:
+    print('TypeError')
+
 # store/delete of super attribute not allowed
 assert hasattr(super(B, B()), 'foo')
 try: