luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib: fix some format specifiers

Browse Source 
- Use CURL_FORMAT_CURL_OFF_T where %zd was erroneously used for some
  curl_off_t variables.

- Use %zu where %zd was erroneously used for some size_t variables.

Prior to this change some of the Windows CI tests were failing because
in Windows 32-bit targets have a 32-bit size_t and a 64-bit curl_off_t.
When %zd was used for some curl_off_t variables then only the lower
32-bits was read and the upper 32-bits would be read for part or all of
the next specifier.

Fixes https://github.com/curl/curl/issues/11327
Closes https://github.com/curl/curl/pull/11321
This commit is contained in:
Jay Satiro 2023-06-15 23:02:48 -04:00
parent 1eca27f100
commit fd306e55a0
11 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/cf-h2-proxy.c
View File

@ -449,7 +449,7 @@ static CURLcode proxy_h2_progress_ingress(struct Curl_cfilter *cf,
/* Process network input buffer fist */ /* Process network input buffer fist */
if(!Curl_bufq_is_empty(&ctx->inbufq)) { if(!Curl_bufq_is_empty(&ctx->inbufq)) {
DEBUGF(LOG_CF(data, cf, "Process %zd bytes in connection buffer", DEBUGF(LOG_CF(data, cf, "Process %zu bytes in connection buffer",
Curl_bufq_len(&ctx->inbufq))); Curl_bufq_len(&ctx->inbufq)));
if(proxy_h2_process_pending_input(cf, data, &result) < 0) if(proxy_h2_process_pending_input(cf, data, &result) < 0)
return result; return result;
@ -463,7 +463,7 @@ static CURLcode proxy_h2_progress_ingress(struct Curl_cfilter *cf,
!Curl_bufq_is_full(&ctx->tunnel.recvbuf)) { !Curl_bufq_is_full(&ctx->tunnel.recvbuf)) {
nread = Curl_bufq_slurp(&ctx->inbufq, proxy_nw_in_reader, cf, &result); nread = Curl_bufq_slurp(&ctx->inbufq, proxy_nw_in_reader, cf, &result);
DEBUGF(LOG_CF(data, cf, "read %zd bytes nw data -> %zd, %d", DEBUGF(LOG_CF(data, cf, "read %zu bytes nw data -> %zd, %d",
Curl_bufq_len(&ctx->inbufq), nread, result)); Curl_bufq_len(&ctx->inbufq), nread, result));
if(nread < 0) { if(nread < 0) {
if(result != CURLE_AGAIN) { if(result != CURLE_AGAIN) {

8
lib/http2.c
View File

@ -1466,8 +1466,8 @@ static ssize_t req_body_read_callback(nghttp2_session *session,
if(nread > 0 && stream->upload_left != -1) if(nread > 0 && stream->upload_left != -1)
stream->upload_left -= nread; stream->upload_left -= nread;
DEBUGF(LOG_CF(data_s, cf, "[h2sid=%d] req_body_read(len=%zu) left=%zd" DEBUGF(LOG_CF(data_s, cf, "[h2sid=%d] req_body_read(len=%zu) left=%"
" -> %zd, %d", CURL_FORMAT_CURL_OFF_T " -> %zd, %d",
stream_id, length, stream->upload_left, nread, result)); stream_id, length, stream->upload_left, nread, result));
if(stream->upload_left == 0) if(stream->upload_left == 0)
@ -1757,7 +1757,7 @@ static CURLcode h2_progress_ingress(struct Curl_cfilter *cf,
/* Process network input buffer fist */ /* Process network input buffer fist */
if(!Curl_bufq_is_empty(&ctx->inbufq)) { if(!Curl_bufq_is_empty(&ctx->inbufq)) {
DEBUGF(LOG_CF(data, cf, "Process %zd bytes in connection buffer", DEBUGF(LOG_CF(data, cf, "Process %zu bytes in connection buffer",
Curl_bufq_len(&ctx->inbufq))); Curl_bufq_len(&ctx->inbufq)));
if(h2_process_pending_input(cf, data, &result) < 0) if(h2_process_pending_input(cf, data, &result) < 0)
return result; return result;
@ -1778,7 +1778,7 @@ static CURLcode h2_progress_ingress(struct Curl_cfilter *cf,
} }
nread = Curl_bufq_slurp(&ctx->inbufq, nw_in_reader, cf, &result); nread = Curl_bufq_slurp(&ctx->inbufq, nw_in_reader, cf, &result);
/* DEBUGF(LOG_CF(data, cf, "read %zd bytes nw data -> %zd, %d", /* DEBUGF(LOG_CF(data, cf, "read %zu bytes nw data -> %zd, %d",
Curl_bufq_len(&ctx->inbufq), nread, result)); */ Curl_bufq_len(&ctx->inbufq), nread, result)); */
if(nread < 0) { if(nread < 0) {
if(result != CURLE_AGAIN) { if(result != CURLE_AGAIN) {

2
lib/mqtt.c
View File

@ -636,7 +636,7 @@ MQTT_SUBACK_COMING:
/* -- switched state -- */ /* -- switched state -- */
remlen = mq->remaining_length; remlen = mq->remaining_length;
infof(data, "Remaining length: %zd bytes", remlen); infof(data, "Remaining length: %zu bytes", remlen);
if(data->set.max_filesize && if(data->set.max_filesize &&
(curl_off_t)remlen > data->set.max_filesize) { (curl_off_t)remlen > data->set.max_filesize) {
failf(data, "Maximum file size exceeded"); failf(data, "Maximum file size exceeded");

7
lib/multi.c
View File

@ -769,8 +769,9 @@ static CURLcode multi_done(struct Curl_easy *data,
#endif #endif
) || conn->bits.close ) || conn->bits.close
|| (premature && !Curl_conn_is_multiplex(conn, FIRSTSOCKET))) { || (premature && !Curl_conn_is_multiplex(conn, FIRSTSOCKET))) {
DEBUGF(infof(data, "multi_done, not re-using connection=%zd, forbid=%d" DEBUGF(infof(data, "multi_done, not re-using connection=%"
", close=%d, premature=%d, conn_multiplex=%d", CURL_FORMAT_CURL_OFF_T ", forbid=%d"
", close=%d, premature=%d, conn_multiplex=%d",
conn->connection_id, conn->connection_id,
data->set.reuse_forbid, conn->bits.close, premature, data->set.reuse_forbid, conn->bits.close, premature,
Curl_conn_is_multiplex(conn, FIRSTSOCKET))); Curl_conn_is_multiplex(conn, FIRSTSOCKET)));
@ -792,7 +793,7 @@ static CURLcode multi_done(struct Curl_easy *data,
/* create string before returning the connection */ /* create string before returning the connection */
curl_off_t connection_id = conn->connection_id; curl_off_t connection_id = conn->connection_id;
msnprintf(buffer, sizeof(buffer), msnprintf(buffer, sizeof(buffer),
"Connection #%zd to host %s left intact", "Connection #%" CURL_FORMAT_CURL_OFF_T " to host %s left intact",
connection_id, host); connection_id, host);
/* the connection is no longer in use by this transfer */ /* the connection is no longer in use by this transfer */
CONNCACHE_UNLOCK(data); CONNCACHE_UNLOCK(data);

4
lib/url.c
View File

@ -1152,8 +1152,8 @@ ConnectionExists(struct Curl_easy *data,
/* primary_ip[0] is NUL only if the resolving of the name hasn't /* primary_ip[0] is NUL only if the resolving of the name hasn't
completed yet and until then we don't re-use this connection */ completed yet and until then we don't re-use this connection */
if(!check->primary_ip[0]) { if(!check->primary_ip[0]) {
infof(data, infof(data, "Connection #%" CURL_FORMAT_CURL_OFF_T " is still "
"Connection #%zd is still name resolving, can't reuse", "name resolving, can't reuse",
check->connection_id); check->connection_id);
continue; continue;
} }

2
lib/vquic/curl_msh3.c
View File

@ -646,7 +646,7 @@ static ssize_t cf_msh3_send(struct Curl_cfilter *cf, struct Curl_easy *data,
} }
else { else {
/* request is open */ /* request is open */
DEBUGF(LOG_CF(data, cf, "req: send %zd body bytes", len)); DEBUGF(LOG_CF(data, cf, "req: send %zu body bytes", len));
if(len > 0xFFFFFFFF) { if(len > 0xFFFFFFFF) {
len = 0xFFFFFFFF; len = 0xFFFFFFFF;
} }

6
lib/vquic/curl_ngtcp2.c
View File

@ -1558,8 +1558,10 @@ cb_h3_read_req_body(nghttp3_conn *conn, int64_t stream_id,
} }
DEBUGF(LOG_CF(data, cf, "[h3sid=%" PRId64 "] read req body -> " DEBUGF(LOG_CF(data, cf, "[h3sid=%" PRId64 "] read req body -> "
"%d vecs%s with %zu (buffered=%zu, left=%zd)", stream->id, "%d vecs%s with %zu (buffered=%zu, left=%"
(int)nvecs, *pflags == NGHTTP3_DATA_FLAG_EOF?" EOF":"", CURL_FORMAT_CURL_OFF_T ")",
stream->id, (int)nvecs,
*pflags == NGHTTP3_DATA_FLAG_EOF?" EOF":"",
nwritten, Curl_bufq_len(&stream->sendbuf), nwritten, Curl_bufq_len(&stream->sendbuf),
stream->upload_left)); stream->upload_left));
return (nghttp3_ssize)nvecs; return (nghttp3_ssize)nvecs;

7
lib/vquic/curl_quiche.c
View File

@ -649,7 +649,7 @@ static CURLcode recv_pkt(const unsigned char *pkt, size_t pktlen,
} }
} }
else if((size_t)nread < pktlen) { else if((size_t)nread < pktlen) {
DEBUGF(LOG_CF(r->data, r->cf, "ingress, quiche only read %zd/%zd bytes", DEBUGF(LOG_CF(r->data, r->cf, "ingress, quiche only read %zd/%zu bytes",
nread, pktlen)); nread, pktlen));
} }
@ -883,7 +883,8 @@ out:
} }
if(nread > 0) if(nread > 0)
ctx->data_recvd += nread; ctx->data_recvd += nread;
DEBUGF(LOG_CF(data, cf, "[h3sid=%"PRId64"] cf_recv(total=%zd) -> %zd, %d", DEBUGF(LOG_CF(data, cf, "[h3sid=%"PRId64"] cf_recv(total=%"
CURL_FORMAT_CURL_OFF_T ") -> %zd, %d",
stream->id, ctx->data_recvd, nread, *err)); stream->id, ctx->data_recvd, nread, *err));
return nread; return nread;
} }
@ -1067,7 +1068,7 @@ static ssize_t cf_quiche_send(struct Curl_cfilter *cf, struct Curl_easy *data,
stream->send_closed = TRUE; stream->send_closed = TRUE;
DEBUGF(LOG_CF(data, cf, "[h3sid=%" PRId64 "] send body(len=%zu, " DEBUGF(LOG_CF(data, cf, "[h3sid=%" PRId64 "] send body(len=%zu, "
"left=%zd) -> %zd", "left=%" CURL_FORMAT_CURL_OFF_T ") -> %zd",
stream->id, len, stream->upload_left, nwritten)); stream->id, len, stream->upload_left, nwritten));
*err = CURLE_OK; *err = CURLE_OK;
} }

6
lib/vquic/vquic.c
View File

@ -362,7 +362,7 @@ static CURLcode recvmmsg_packets(struct Curl_cfilter *cf,
} }
out: out:
DEBUGF(LOG_CF(data, cf, "recvd %zu packets with %zd bytes -> %d", DEBUGF(LOG_CF(data, cf, "recvd %zu packets with %zu bytes -> %d",
pkts, total_nread, result)); pkts, total_nread, result));
return result; return result;
} }
@ -425,7 +425,7 @@ static CURLcode recvmsg_packets(struct Curl_cfilter *cf,
} }
out: out:
DEBUGF(LOG_CF(data, cf, "recvd %zu packets with %zd bytes -> %d", DEBUGF(LOG_CF(data, cf, "recvd %zu packets with %zu bytes -> %d",
pkts, total_nread, result)); pkts, total_nread, result));
return result; return result;
} }
@ -482,7 +482,7 @@ static CURLcode recvfrom_packets(struct Curl_cfilter *cf,
} }
out: out:
DEBUGF(LOG_CF(data, cf, "recvd %zu packets with %zd bytes -> %d", DEBUGF(LOG_CF(data, cf, "recvd %zu packets with %zu bytes -> %d",
pkts, total_nread, result)); pkts, total_nread, result));
return result; return result;
} }

2
lib/vssh/wolfssh.c
View File

@ -277,7 +277,7 @@ static ssize_t wsftp_send(struct Curl_easy *data, int sockindex,
return -1; return -1;
} }
DEBUGASSERT(rc == (int)len); DEBUGASSERT(rc == (int)len);
infof(data, "sent %zd bytes SFTP from offset %zd", infof(data, "sent %zu bytes SFTP from offset %" CURL_FORMAT_CURL_OFF_T,
len, sshc->offset); len, sshc->offset);
sshc->offset += len; sshc->offset += len;
return (ssize_t)rc; return (ssize_t)rc;

19
lib/ws.c
View File

@ -126,8 +126,9 @@ static void ws_dec_info(struct ws_decoder *dec, struct Curl_easy *data,
dec->head_len, dec->head_total); dec->head_len, dec->head_total);
} }
else { else {
infof(data, "WS-DEC: %s [%s%s payload=%zd/%zd]", msg, infof(data, "WS-DEC: %s [%s%s payload=%" CURL_FORMAT_CURL_OFF_T
ws_frame_name_of_op(dec->head[0]), "/%" CURL_FORMAT_CURL_OFF_T "]",
msg, ws_frame_name_of_op(dec->head[0]),
(dec->head[0] & WSBIT_FIN)? "" : " NON-FINAL", (dec->head[0] & WSBIT_FIN)? "" : " NON-FINAL",
dec->payload_offset, dec->payload_len); dec->payload_offset, dec->payload_len);
} }
@ -272,7 +273,8 @@ static CURLcode ws_dec_pass_payload(struct ws_decoder *dec,
Curl_bufq_skip(inraw, (size_t)nwritten); Curl_bufq_skip(inraw, (size_t)nwritten);
dec->payload_offset += (curl_off_t)nwritten; dec->payload_offset += (curl_off_t)nwritten;
remain = dec->payload_len - dec->payload_offset; remain = dec->payload_len - dec->payload_offset;
/* infof(data, "WS-DEC: passed %zd bytes payload, %zd remain", /* infof(data, "WS-DEC: passed %zd bytes payload, %"
CURL_FORMAT_CURL_OFF_T " remain",
nwritten, remain); */ nwritten, remain); */
} }
@ -351,8 +353,9 @@ static void update_meta(struct websocket *ws,
static void ws_enc_info(struct ws_encoder *enc, struct Curl_easy *data, static void ws_enc_info(struct ws_encoder *enc, struct Curl_easy *data,
const char *msg) const char *msg)
{ {
infof(data, "WS-ENC: %s [%s%s%s payload=%zd/%zd]", msg, infof(data, "WS-ENC: %s [%s%s%s payload=%" CURL_FORMAT_CURL_OFF_T
ws_frame_name_of_op(enc->firstbyte), "/%" CURL_FORMAT_CURL_OFF_T "]",
msg, ws_frame_name_of_op(enc->firstbyte),
(enc->firstbyte & WSBIT_OPCODE_MASK) == WSBIT_OPCODE_CONT ? (enc->firstbyte & WSBIT_OPCODE_MASK) == WSBIT_OPCODE_CONT ?
" CONT" : "", " CONT" : "",
(enc->firstbyte & WSBIT_FIN)? "" : " NON-FIN", (enc->firstbyte & WSBIT_FIN)? "" : " NON-FIN",
@ -921,7 +924,8 @@ CURL_EXTERN CURLcode curl_ws_recv(struct Curl_easy *data, void *buffer,
ctx.payload_len, ctx.bufidx); ctx.payload_len, ctx.bufidx);
*metap = &ws->frame; *metap = &ws->frame;
*nread = ws->frame.len; *nread = ws->frame.len;
/* infof(data, "curl_ws_recv(len=%zu) -> %zu bytes (frame at %zd, %zd left)", /* infof(data, "curl_ws_recv(len=%zu) -> %zu bytes (frame at %"
CURL_FORMAT_CURL_OFF_T ", %" CURL_FORMAT_CURL_OFF_T " left)",
buflen, *nread, ws->frame.offset, ws->frame.bytesleft); */ buflen, *nread, ws->frame.offset, ws->frame.bytesleft); */
return CURLE_OK; return CURLE_OK;
} }
@ -1036,7 +1040,8 @@ CURL_EXTERN CURLcode curl_ws_send(struct Curl_easy *data, const void *buffer,
} }
else { else {
if((curl_off_t)buflen > ws->enc.payload_remain) { if((curl_off_t)buflen > ws->enc.payload_remain) {
infof(data, "WS: unaligned frame size (sending %zu instead of %zd)", infof(data, "WS: unaligned frame size (sending %zu instead of %"
CURL_FORMAT_CURL_OFF_T ")",
buflen, ws->enc.payload_remain); buflen, ws->enc.payload_remain);
} }
} }