curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-09 21:52:40 +03:00
Code Issues Packages Projects Releases Wiki Activity

vquic: init for every call to recvmsg

Browse Source 
When calling recvmsg(), always set up the msg structures for
each call as there are OS implemenations that change members
of msg.

Fixes #17120
Reported-by: Harry Sintonen
Closes #17131
This commit is contained in:
Stefan Eissing 2025-04-22 13:12:24 +02:00 committed by Daniel Stenberg
parent 2de9a97141
commit 4872dafd80
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/vquic/vquic.c
View File

@ -481,19 +481,21 @@ static CURLcode recvmsg_packets(struct Curl_cfilter *cf,
size_t pktlen; size_t pktlen;
size_t offset, to; size_t offset, to;
msg_iov.iov_base = buf;
msg_iov.iov_len = (int)sizeof(buf);
memset(&msg, 0, sizeof(msg));
msg.msg_iov = &msg_iov;
msg.msg_iovlen = 1;
msg.msg_control = msg_ctrl;
DEBUGASSERT(max_pkts > 0); DEBUGASSERT(max_pkts > 0);
for(pkts = 0, total_nread = 0; pkts < max_pkts;) { for(pkts = 0, total_nread = 0; pkts < max_pkts;) {
/* fully initialise this on each call to `recvmsg()`. There are
* operating systems out there that mess with `msg_iov.iov_len`
* in the call (*staring at NetBSD*). */
memset(&msg, 0, sizeof(msg));
msg_iov.iov_base = buf;
msg_iov.iov_len = (int)sizeof(buf);
msg.msg_iov = &msg_iov;
msg.msg_iovlen = 1;
msg.msg_control = msg_ctrl;
msg.msg_name = &remote_addr; msg.msg_name = &remote_addr;
msg.msg_namelen = sizeof(remote_addr); msg.msg_namelen = sizeof(remote_addr);
msg.msg_controllen = sizeof(msg_ctrl); msg.msg_controllen = sizeof(msg_ctrl);
while((nread = recvmsg(qctx->sockfd, &msg, 0)) == -1 && while((nread = recvmsg(qctx->sockfd, &msg, 0)) == -1 &&
SOCKERRNO == SOCKEINTR) SOCKERRNO == SOCKEINTR)
; ;