5 files changed, 19 insertions, 12 deletions
diff --git a/shared-bindings/displayio/Display.c b/shared-bindings/displayio/Display.c
index 52ab2ef31..84302a175 100644
--- a/shared-bindings/displayio/Display.c
+++ b/shared-bindings/displayio/Display.c
@@ -31,6 +31,7 @@
 #include "lib/utils/context_manager_helpers.h"
 #include "py/binary.h"
 #include "py/objproperty.h"
+#include "py/objtype.h"
 #include "py/runtime.h"
 #include "shared-bindings/displayio/Group.h"
 #include "shared-bindings/microcontroller/Pin.h"
@@ -172,6 +173,7 @@ STATIC mp_obj_t displayio_display_make_new(const mp_obj_type_t *type, size_t n_a
 // Helper to ensure we have the native super class instead of a subclass.
 static displayio_display_obj_t* native_display(mp_obj_t display_obj) {
     mp_obj_t native_display = mp_instance_cast_to_native_base(display_obj, &displayio_display_type);
+    mp_obj_assert_native_inited(native_display);
     return MP_OBJ_TO_PTR(native_display);
 }
 
@@ -184,11 +186,7 @@ STATIC mp_obj_t displayio_display_obj_show(mp_obj_t self_in, mp_obj_t group_in)
     displayio_display_obj_t *self = native_display(self_in);
     displayio_group_t* group = NULL;
     if (group_in != mp_const_none) {
-        mp_obj_t native_layer = mp_instance_cast_to_native_base(group_in, &displayio_group_type);
-        if (native_layer == MP_OBJ_NULL) {
-            mp_raise_ValueError(translate("Must be a Group subclass."));
-        }
-        group = MP_OBJ_TO_PTR(native_layer);
+        group = MP_OBJ_TO_PTR(native_group(group_in));
     }
 
     common_hal_displayio_display_show(self, group);
diff --git a/shared-bindings/displayio/Group.c b/shared-bindings/displayio/Group.c
index c7a72891a..bbf7190a3 100644
--- a/shared-bindings/displayio/Group.c
+++ b/shared-bindings/displayio/Group.c
@@ -31,6 +31,7 @@
 #include "lib/utils/context_manager_helpers.h"
 #include "py/binary.h"
 #include "py/objproperty.h"
+#include "py/objtype.h"
 #include "py/runtime.h"
 #include "supervisor/shared/translate.h"
 
@@ -80,8 +81,12 @@ STATIC mp_obj_t displayio_group_make_new(const mp_obj_type_t *type, size_t n_arg
 }
 
 // Helper to ensure we have the native super class instead of a subclass.
-static displayio_group_t* native_group(mp_obj_t group_obj) {
+displayio_group_t* native_group(mp_obj_t group_obj) {
     mp_obj_t native_group = mp_instance_cast_to_native_base(group_obj, &displayio_group_type);
+    if (native_group == MP_OBJ_NULL) {
+        mp_raise_ValueError_varg(translate("Must be a %q subclass."), MP_QSTR_Group);
+    }
+    mp_obj_assert_native_inited(native_group);
     return MP_OBJ_TO_PTR(native_group);
 }
 
diff --git a/shared-bindings/displayio/Group.h b/shared-bindings/displayio/Group.h
index fa3c32964..0570735cf 100644
--- a/shared-bindings/displayio/Group.h
+++ b/shared-bindings/displayio/Group.h
@@ -31,6 +31,7 @@
 
 extern const mp_obj_type_t displayio_group_type;
 
+displayio_group_t* native_group(mp_obj_t group_obj);
 
 void common_hal_displayio_group_construct(displayio_group_t* self, uint32_t max_size, uint32_t scale, mp_int_t x, mp_int_t y);
 uint32_t common_hal_displayio_group_get_scale(displayio_group_t* self);
diff --git a/shared-bindings/displayio/TileGrid.c b/shared-bindings/displayio/TileGrid.c
index 2b41eb8fd..6d18ac78f 100644
--- a/shared-bindings/displayio/TileGrid.c
+++ b/shared-bindings/displayio/TileGrid.c
@@ -31,6 +31,7 @@
 #include "lib/utils/context_manager_helpers.h"
 #include "py/binary.h"
 #include "py/objproperty.h"
+#include "py/objtype.h"
 #include "py/runtime.h"
 #include "shared-bindings/displayio/Bitmap.h"
 #include "shared-bindings/displayio/ColorConverter.h"
@@ -139,6 +140,7 @@ STATIC mp_obj_t displayio_tilegrid_make_new(const mp_obj_type_t *type, size_t n_
 // Helper to ensure we have the native super class instead of a subclass.
 static displayio_tilegrid_t* native_tilegrid(mp_obj_t tilegrid_obj) {
     mp_obj_t native_tilegrid = mp_instance_cast_to_native_base(tilegrid_obj, &displayio_tilegrid_type);
+    mp_obj_assert_native_inited(native_tilegrid);
     return MP_OBJ_TO_PTR(native_tilegrid);
 }
 
diff --git a/shared-bindings/socket/__init__.c b/shared-bindings/socket/__init__.c
index 8e34c3700..085d4e690 100644
--- a/shared-bindings/socket/__init__.c
+++ b/shared-bindings/socket/__init__.c
@@ -257,7 +257,7 @@ STATIC mp_int_t _socket_recv_into(mod_network_socket_obj_t *sock, byte *buf, mp_
 //|   Reads some bytes from the connected remote address, writing
 //|   into the provided buffer. If bufsize <= len(buffer) is given,
 //|   a maximum of bufsize bytes will be read into the buffer. If no
-//|   valid value is given for bufsize, the default is the length of 
+//|   valid value is given for bufsize, the default is the length of
 //|   the given buffer.
 //|
 //|   Suits sockets of type SOCK_STREAM
@@ -274,13 +274,14 @@ STATIC mp_obj_t socket_recv_into(size_t n_args, const mp_obj_t *args) {
     }
     mp_buffer_info_t bufinfo;
     mp_get_buffer_raise(args[1], &bufinfo, MP_BUFFER_WRITE);
-    mp_int_t len;
+    mp_int_t len = bufinfo.len;
     if (n_args == 3) {
-        len = mp_obj_get_int(args[2]);
-    }
-    if (n_args == 2 || (size_t) len > bufinfo.len) {
-        len = bufinfo.len;
+        mp_int_t given_len = mp_obj_get_int(args[2]);
+        if (given_len < len) {
+            len = given_len;
+        }
     }
+
     mp_int_t ret = _socket_recv_into(self, (byte*)bufinfo.buf, len);
     return mp_obj_new_int_from_uint(ret);
 }