stv0g/re
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

patch: make sure arguments to %w and %b are of type size_t

Browse source
This commit is contained in:
Alfred E. Heggestad 2013-04-24 21:00:21 +00:00
parent 21ea0b676e
commit 85e6fc64a4
13 changed files with 37 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/httpauth/digest.c
View file

@ -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)

4
src/rtp/pkt.c
View file

@ -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");

3
src/rtp/rtcp.c
View file

@ -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, "}");
}

2
src/sipreg/reg.c
View file

@ -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);
}

12
src/sipsess/accept.c
View file

@ -108,7 +108,7 @@ int sipsess_accept(struct sipsess **sessp, struct sipsess_sock *sock,
"Contact: <sip:%s@%J%s>\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: <sip:%s@%J%s>\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);

6
src/sipsess/ack.c
View file

@ -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;

8
src/sipsess/connect.c
View file

@ -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);
}

2
src/sipsess/info.c
View file

@ -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,

6
src/sipsess/modify.c
View file

@ -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);
}

6
src/sipsess/reply.c
View file

@ -97,7 +97,7 @@ int sipsess_reply_2xx(struct sipsess *sess, const struct sip_msg *msg,
"Contact: <sip:%s@%J%s>\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;

10
src/stun/attr.c
View file

@ -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:

6
src/stun/ctrans.c
View file

@ -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;

2
src/stun/msg.c
View file

@ -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);
}