Skip to content

Commit b0eb91d

Browse files
authored
Merge pull request #3955 from caiokat/fix_recvfrom_into
Fix socket.recvfrom_into()
2 parents 1c12d83 + 7b4558b commit b0eb91d

File tree

1 file changed

+3
-4
lines changed
  • ports/esp32s2/common-hal/socketpool

1 file changed

+3
-4
lines changed

ports/esp32s2/common-hal/socketpool/Socket.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -178,18 +178,17 @@ mp_uint_t common_hal_socketpool_socket_recvfrom_into(socketpool_socket_obj_t* se
178178

179179
struct sockaddr_in source_addr;
180180
socklen_t socklen = sizeof(source_addr);
181-
int bytes_received = lwip_recvfrom(self->num, buf, len - 1, 0, (struct sockaddr *)&source_addr, &socklen);
181+
int bytes_received = lwip_recvfrom(self->num, buf, len, 0, (struct sockaddr *)&source_addr, &socklen);
182182

183183
memcpy((void *)ip, (void*)&source_addr.sin_addr.s_addr, sizeof source_addr.sin_addr.s_addr);
184184
*port = source_addr.sin_port;
185185

186186
if (bytes_received < 0) {
187187
mp_raise_BrokenPipeError();
188188
return 0;
189-
} else {
190-
buf[bytes_received] = 0; // Null-terminate whatever we received
191-
return bytes_received;
192189
}
190+
191+
return bytes_received;
193192
}
194193

195194
void common_hal_socketpool_socket_close(socketpool_socket_obj_t* self) {

0 commit comments

Comments
 (0)