fix: remove the assert because buffer can be larger than UINT16_MAX.

zoff99 · robinlinden · commit 6b0d1151ac81 · 2022-04-18T17:14:02.000+02:00
diff --git a/other/bootstrap_daemon/docker/tox-bootstrapd.sha256 b/other/bootstrap_daemon/docker/tox-bootstrapd.sha256
@@ -1 +1 @@
-261754f9fc58cd2d229488f00ea3503afbcc797cebcd10af1fad9e1adb3faf46  /usr/local/bin/tox-bootstrapd
+f80fc29c2a87f393fb84d56289ccfcc2e9860013627b20d76b6dfa56c8a8ffeb  /usr/local/bin/tox-bootstrapd
diff --git a/toxcore/network.c b/toxcore/network.c
@@ -1791,8 +1791,7 @@ Socket net_socket(const Network *ns, Family domain, int type, int protocol)
 uint16_t net_socket_data_recv_buffer(const Network *ns, Socket sock)
 {
     const int count = ns->funcs->recvbuf(ns->obj, sock.sock);
-    assert(count >= 0 && count <= UINT16_MAX);
-    return (uint16_t)count;
+    return (uint16_t)max_s32(0, min_s32(count, UINT16_MAX));
 }
 
 uint32_t net_htonl(uint32_t hostlong)

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-261754f9fc58cd2d229488f00ea3503afbcc797cebcd10af1fad9e1adb3faf46 /usr/local/bin/tox-bootstrapd`
	`1`	`+f80fc29c2a87f393fb84d56289ccfcc2e9860013627b20d76b6dfa56c8a8ffeb /usr/local/bin/tox-bootstrapd`
Original file line number	Diff line number	Diff line change
`@@ -1791,8 +1791,7 @@ Socket net_socket(const Network *ns, Family domain, int type, int protocol)`
`1791`	`1791`	`uint16_t net_socket_data_recv_buffer(const Network *ns, Socket sock)`
`1792`	`1792`	`{`
`1793`	`1793`	`const int count = ns->funcs->recvbuf(ns->obj, sock.sock);`
`1794`		`- assert(count >= 0 && count <= UINT16_MAX);`
`1795`		`- return (uint16_t)count;`
	`1794`	`+ return (uint16_t)max_s32(0, min_s32(count, UINT16_MAX));`
`1796`	`1795`	`}`
`1797`	`1796`
`1798`	`1797`	`uint32_t net_htonl(uint32_t hostlong)`