Merge pull request #3397 from tannewt/fix_size_0_bug

tannewt · web-flow · commit 3d8bac50e41a · 2020-09-14T14:47:28.000-07:00
Fix bug with socket.recv_into size == 0.
diff --git a/shared-bindings/socketpool/Socket.c b/shared-bindings/socketpool/Socket.c
@@ -261,7 +261,7 @@ STATIC mp_obj_t socketpool_socket_recv_into(size_t n_args, const mp_obj_t *args)
     mp_int_t len = bufinfo.len;
     if (n_args == 3) {
         mp_int_t given_len = mp_obj_get_int(args[2]);
-        if (given_len < len) {
+        if (given_len > 0 && given_len < len) {
             len = given_len;
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -261,7 +261,7 @@ STATIC mp_obj_t socketpool_socket_recv_into(size_t n_args, const mp_obj_t *args)`
`261`	`261`	`mp_int_t len = bufinfo.len;`
`262`	`262`	`if (n_args == 3) {`
`263`	`263`	`mp_int_t given_len = mp_obj_get_int(args[2]);`
`264`		`- if (given_len < len) {`
	`264`	`+ if (given_len > 0 && given_len < len) {`
`265`	`265`	`len = given_len;`
`266`	`266`	`}`
`267`	`267`	`}`