Willy,
squash this one if you like.
Best regards
Tim Düsterhus
Apply with `git am --scissors` to automatically cut the commit message.
-- >8 --
This adds the missing blank lines in `make_proxy_line_v2` and
`conn_recv_proxy`. It also adjusts the type of the temporary variable
used for the return value of `recv` to be `ssize_t` instead of `int`.
---
src/connection.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/connection.c b/src/connection.c
index ba0e0fcd1..dd20cdcfd 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -802,7 +802,8 @@ int conn_recv_proxy(struct connection *conn, int flag)
* fail.
*/
while (1) {
- int len2 = recv(conn->handle.fd, trash.area, trash.data, 0);
+ ssize_t len2 = recv(conn->handle.fd, trash.area, trash.data, 0);
+
if (len2 < 0 && errno == EINTR)
continue;
if (len2 != trash.data)
@@ -1437,6 +1438,7 @@ int make_proxy_line_v2(char *buf, int buf_len, struct
server *srv, struct connec
if (srv->pp_opts & SRV_PP_V2_CRC32C) {
uint32_t zero_crc32c = 0;
+
if ((buf_len - ret) < sizeof(struct tlv))
return 0;
tlv_crc32c_p = (void *)((struct tlv *)&buf[ret])->value;
@@ -1486,6 +1488,7 @@ int make_proxy_line_v2(char *buf, int buf_len, struct
server *srv, struct connec
if (srv->pp_opts & SRV_PP_V2_SSL) {
struct tlv_ssl *tlv;
int ssl_tlv_len = 0;
+
if ((buf_len - ret) < sizeof(struct tlv_ssl))
return 0;
tlv = (struct tlv_ssl *)&buf[ret];
--
2.25.1
