From 85e6fc64a407a78f354b214b071f74c5aa187350 Mon Sep 17 00:00:00 2001 From: "Alfred E. Heggestad" Date: Wed, 24 Apr 2013 21:00:21 +0000 Subject: [PATCH] patch: make sure arguments to %w and %b are of type size_t --- src/httpauth/digest.c | 4 ++-- src/rtp/pkt.c | 4 ++-- src/rtp/rtcp.c | 3 ++- src/sipreg/reg.c | 2 +- src/sipsess/accept.c | 12 ++++++------ src/sipsess/ack.c | 6 +++--- src/sipsess/connect.c | 8 ++++---- src/sipsess/info.c | 2 +- src/sipsess/modify.c | 6 +++--- src/sipsess/reply.c | 6 +++--- src/stun/attr.c | 10 ++++++---- src/stun/ctrans.c | 6 +++--- src/stun/msg.c | 2 +- 13 files changed, 37 insertions(+), 34 deletions(-) diff --git a/src/httpauth/digest.c b/src/httpauth/digest.c index 002ceec..584511e 100644 --- a/src/httpauth/digest.c +++ b/src/httpauth/digest.c @@ -188,7 +188,7 @@ int httpauth_digest_response_auth(const struct httpauth_digest_resp *resp, if (pl_isset(&resp->qop)) err = md5_printf(digest, "%w:%r:%r:%r:%r:%w", - ha1, MD5_SIZE, + ha1, (size_t)MD5_SIZE, &resp->nonce, &resp->nc, &resp->cnonce, @@ -196,7 +196,7 @@ int httpauth_digest_response_auth(const struct httpauth_digest_resp *resp, ha2, sizeof(ha2)); else err = md5_printf(digest, "%w:%r:%w", - ha1, MD5_SIZE, + ha1, (size_t)MD5_SIZE, &resp->nonce, ha2, sizeof(ha2)); if (err) diff --git a/src/rtp/pkt.c b/src/rtp/pkt.c index 5a4e58f..6542f16 100644 --- a/src/rtp/pkt.c +++ b/src/rtp/pkt.c @@ -133,7 +133,7 @@ int rtcp_vencode(struct mbuf *mb, enum rtcp_type type, uint32_t count, size_t i, pos; uint16_t len; const uint8_t *data; - uint32_t data_len; + size_t data_len; const uint32_t *srcv; const char *reason; rtcp_encode_h *ench; @@ -190,7 +190,7 @@ int rtcp_vencode(struct mbuf *mb, enum rtcp_type type, uint32_t count, err = mbuf_write_u32(mb, htonl(va_arg(ap, uint32_t))); err |= mbuf_write_mem(mb, va_arg(ap, uint8_t *), 4); data = va_arg(ap, const uint8_t *); - data_len = va_arg(ap, uint32_t); + data_len = va_arg(ap, size_t); if (data) { if (data_len % 4) { DEBUG_WARNING("not a multiple of 32bits\n"); diff --git a/src/rtp/rtcp.c b/src/rtp/rtcp.c index db23ca5..caf9b66 100644 --- a/src/rtp/rtcp.c +++ b/src/rtp/rtcp.c @@ -206,7 +206,8 @@ int rtcp_msg_print(struct re_printf *pf, const struct rtcp_msg *msg) item = &sdes->itemv[j]; err = re_hprintf(pf, " <%s:%b>", rtcp_sdes_name(item->type), - item->data, item->length); + item->data, + (size_t)item->length); } err |= re_hprintf(pf, "}"); } diff --git a/src/sipreg/reg.c b/src/sipreg/reg.c index a8c6cd6..9627f72 100644 --- a/src/sipreg/reg.c +++ b/src/sipreg/reg.c @@ -294,7 +294,7 @@ static int request(struct sipreg *reg, bool reset_ls) reg->regid > 0 ? "Supported: outbound, path\r\n" : "", reg->hdrs ? mbuf_buf(reg->hdrs) : NULL, - reg->hdrs ? mbuf_get_left(reg->hdrs) : 0); + reg->hdrs ? mbuf_get_left(reg->hdrs) : (size_t)0); } diff --git a/src/sipsess/accept.c b/src/sipsess/accept.c index fdfbd9e..69d911d 100644 --- a/src/sipsess/accept.c +++ b/src/sipsess/accept.c @@ -108,7 +108,7 @@ int sipsess_accept(struct sipsess **sessp, struct sipsess_sock *sock, "Contact: \r\n" "%v" "%s%s%s" - "Content-Length: %u\r\n" + "Content-Length: %zu\r\n" "\r\n" "%b", sess->cuser, &msg->dst, @@ -117,9 +117,9 @@ int sipsess_accept(struct sipsess **sessp, struct sipsess_sock *sock, desc ? "Content-Type: " : "", desc ? sess->ctype : "", desc ? "\r\n" : "", - desc ? mbuf_get_left(desc) : 0, + desc ? mbuf_get_left(desc) : (size_t)0, desc ? mbuf_buf(desc) : NULL, - desc ? mbuf_get_left(desc) : 0); + desc ? mbuf_get_left(desc) : (size_t)0); va_end(ap); @@ -163,7 +163,7 @@ int sipsess_progress(struct sipsess *sess, uint16_t scode, const char *reason, "Contact: \r\n" "%v" "%s%s%s" - "Content-Length: %u\r\n" + "Content-Length: %zu\r\n" "\r\n" "%b", sess->cuser, &sess->msg->dst, @@ -172,9 +172,9 @@ int sipsess_progress(struct sipsess *sess, uint16_t scode, const char *reason, desc ? "Content-Type: " : "", desc ? sess->ctype : "", desc ? "\r\n" : "", - desc ? mbuf_get_left(desc) : 0, + desc ? mbuf_get_left(desc) : (size_t)0, desc ? mbuf_buf(desc) : NULL, - desc ? mbuf_get_left(desc) : 0); + desc ? mbuf_get_left(desc) : (size_t)0); va_end(ap); diff --git a/src/sipsess/ack.c b/src/sipsess/ack.c index 7e95130..c1a3acc 100644 --- a/src/sipsess/ack.c +++ b/src/sipsess/ack.c @@ -97,15 +97,15 @@ int sipsess_ack(struct sipsess_sock *sock, struct sip_dialog *dlg, err = sip_drequestf(&ack->req, sock->sip, false, "ACK", dlg, cseq, auth, send_handler, resp_handler, ack, "%s%s%s" - "Content-Length: %u\r\n" + "Content-Length: %zu\r\n" "\r\n" "%b", desc ? "Content-Type: " : "", desc ? ctype : "", desc ? "\r\n" : "", - desc ? mbuf_get_left(desc) : 0, + desc ? mbuf_get_left(desc) : (size_t)0, desc ? mbuf_buf(desc) : NULL, - desc ? mbuf_get_left(desc) : 0); + desc ? mbuf_get_left(desc) : (size_t)0); if (err) goto out; diff --git a/src/sipsess/connect.c b/src/sipsess/connect.c index cc9b37e..f35bed8 100644 --- a/src/sipsess/connect.c +++ b/src/sipsess/connect.c @@ -133,17 +133,17 @@ static int invite(struct sipsess *sess) send_handler, invite_resp_handler, sess, "%b" "%s%s%s" - "Content-Length: %u\r\n" + "Content-Length: %zu\r\n" "\r\n" "%b", sess->hdrs ? mbuf_buf(sess->hdrs) : NULL, - sess->hdrs ? mbuf_get_left(sess->hdrs) : 0, + sess->hdrs ? mbuf_get_left(sess->hdrs) :(size_t)0, sess->desc ? "Content-Type: " : "", sess->desc ? sess->ctype : "", sess->desc ? "\r\n" : "", - sess->desc ? mbuf_get_left(sess->desc) : 0, + sess->desc ? mbuf_get_left(sess->desc) :(size_t)0, sess->desc ? mbuf_buf(sess->desc) : NULL, - sess->desc ? mbuf_get_left(sess->desc) : 0); + sess->desc ? mbuf_get_left(sess->desc):(size_t)0); } diff --git a/src/sipsess/info.c b/src/sipsess/info.c index c665e3f..725a190 100644 --- a/src/sipsess/info.c +++ b/src/sipsess/info.c @@ -78,7 +78,7 @@ static int info_request(struct sipsess_request *req) req->sess->dlg, 0, req->sess->auth, NULL, info_resp_handler, req, "Content-Type: %s\r\n" - "Content-Length: %u\r\n" + "Content-Length: %zu\r\n" "\r\n" "%b", req->ctype, diff --git a/src/sipsess/modify.c b/src/sipsess/modify.c index 67b3ff4..c6b7129 100644 --- a/src/sipsess/modify.c +++ b/src/sipsess/modify.c @@ -131,15 +131,15 @@ int sipsess_reinvite(struct sipsess *sess, bool reset_ls) sess->dlg, 0, sess->auth, send_handler, reinvite_resp_handler, sess, "%s%s%s" - "Content-Length: %u\r\n" + "Content-Length: %zu\r\n" "\r\n" "%b", sess->desc ? "Content-Type: " : "", sess->desc ? sess->ctype : "", sess->desc ? "\r\n" : "", - sess->desc ? mbuf_get_left(sess->desc) : 0, + sess->desc ? mbuf_get_left(sess->desc) :(size_t)0, sess->desc ? mbuf_buf(sess->desc) : NULL, - sess->desc ? mbuf_get_left(sess->desc) : 0); + sess->desc ? mbuf_get_left(sess->desc):(size_t)0); } diff --git a/src/sipsess/reply.c b/src/sipsess/reply.c index 1b01c92..adbcefa 100644 --- a/src/sipsess/reply.c +++ b/src/sipsess/reply.c @@ -97,7 +97,7 @@ int sipsess_reply_2xx(struct sipsess *sess, const struct sip_msg *msg, "Contact: \r\n" "%v" "%s%s%s" - "Content-Length: %u\r\n" + "Content-Length: %zu\r\n" "\r\n" "%b", sess->cuser, &msg->dst, sip_transp_param(msg->tp), @@ -105,9 +105,9 @@ int sipsess_reply_2xx(struct sipsess *sess, const struct sip_msg *msg, desc ? "Content-Type: " : "", desc ? sess->ctype : "", desc ? "\r\n" : "", - desc ? mbuf_get_left(desc) : 0, + desc ? mbuf_get_left(desc) : (size_t)0, desc ? mbuf_buf(desc) : NULL, - desc ? mbuf_get_left(desc) : 0); + desc ? mbuf_get_left(desc) : (size_t)0); if (err) goto out; diff --git a/src/stun/attr.c b/src/stun/attr.c index 12ca92f..313ddd7 100644 --- a/src/stun/attr.c +++ b/src/stun/attr.c @@ -422,7 +422,8 @@ void stun_attr_dump(const struct stun_attr *a) break; case STUN_ATTR_MSG_INTEGRITY: - (void)re_printf("%w", &a->v.msg_integrity, 20); + (void)re_printf("%w", a->v.msg_integrity, + sizeof(a->v.msg_integrity)); break; case STUN_ATTR_ERR_CODE: @@ -446,9 +447,10 @@ void stun_attr_dump(const struct stun_attr *a) case STUN_ATTR_DATA: case STUN_ATTR_PADDING: - len = mbuf_get_left(&a->v.mb); - (void)re_printf("%w%s (%u bytes)", mbuf_buf(&a->v.mb), - MIN(len, 16), len > 16 ? "..." : "", len); + len = min(mbuf_get_left(&a->v.mb), 16); + (void)re_printf("%w%s (%zu bytes)", mbuf_buf(&a->v.mb), len, + mbuf_get_left(&a->v.mb) > 16 ? "..." : "", + mbuf_get_left(&a->v.mb)); break; case STUN_ATTR_REQ_ADDR_FAMILY: diff --git a/src/stun/ctrans.c b/src/stun/ctrans.c index 42c23e9..db294e4 100644 --- a/src/stun/ctrans.c +++ b/src/stun/ctrans.c @@ -332,11 +332,11 @@ static bool debug_handler(struct le *le, void *arg) int err = 0; err |= re_hprintf(pf, " method=%s", stun_method_name(ct->met)); - err |= re_hprintf(pf, " tid=%w", ct->tid, STUN_TID_SIZE); + err |= re_hprintf(pf, " tid=%w", ct->tid, sizeof(ct->tid)); err |= re_hprintf(pf, " rto=%ums", stun_conf(ct->stun)->rto); err |= re_hprintf(pf, " tmr=%llu", tmr_get_expire(&ct->tmr)); - err |= re_hprintf(pf, " n=%d", ct->txc); - err |= re_hprintf(pf, " interval=%d", ct->ival); + err |= re_hprintf(pf, " n=%u", ct->txc); + err |= re_hprintf(pf, " interval=%u", ct->ival); err |= re_hprintf(pf, "\n"); return 0 != err; diff --git a/src/stun/msg.c b/src/stun/msg.c index b8289c4..c8ca4bf 100644 --- a/src/stun/msg.c +++ b/src/stun/msg.c @@ -364,7 +364,7 @@ void stun_msg_dump(const struct stun_msg *msg) stun_method_name(stun_msg_method(msg)), stun_class_name(stun_msg_class(msg)), msg->hdr.len, msg->hdr.cookie, - msg->hdr.tid, STUN_TID_SIZE); + msg->hdr.tid, sizeof(msg->hdr.tid)); stun_msg_attr_apply(msg, attr_print, NULL); }