sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed reports classified as high impact

This commit is contained in:
sauwming 2023-03-03 10:53:22 +08:00
parent ecddafbb1d
commit 456b38700c
8 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pjlib-util/src/pjlib-util/cli_console.c
View File

@ -104,7 +104,7 @@ PJ_DEF(void) pj_cli_console_cfg_default(pj_cli_console_cfg *param)
param->log_level = PJ_CLI_CONSOLE_LOG_LEVEL;
pj_bzero(&param->prompt_str, sizeof(pj_str_t));
param->quit_command.slen = 0;
pj_bzero(&param->quit_command, sizeof(pj_str_t));
}
PJ_DEF(pj_status_t) pj_cli_console_create(pj_cli_t *cli,

8
pjlib/src/pj/ip_helper_generic.c
View File

@ -496,8 +496,10 @@ static pj_status_t get_ipv6_deprecated(unsigned *count, pj_sockaddr addr[])
netlink_req.ifaddrmsg_info.ifa_family = AF_INET6;
int rtn = send(fd, &netlink_req, netlink_req.nlmsg_info.nlmsg_len, 0);
if (rtn < 0)
if (rtn < 0) {
close(fd);
return PJ_RETURN_OS_ERROR(pj_get_native_netos_error());
}
char read_buffer[pagesize];
size_t idx = 0;
@ -505,8 +507,10 @@ static pj_status_t get_ipv6_deprecated(unsigned *count, pj_sockaddr addr[])
while(1) {
bzero(read_buffer, pagesize);
int read_size = recv(fd, read_buffer, pagesize, 0);
if (read_size < 0)
if (read_size < 0) {
close(fd);
return PJ_RETURN_OS_ERROR(pj_get_native_netos_error());
}
struct nlmsghdr *nlmsg_ptr = (struct nlmsghdr *) read_buffer;
int nlmsg_len = read_size;

2
pjmedia/src/pjmedia-codec/ffmpeg_vid_codecs.c
View File

@ -988,7 +988,7 @@ PJ_DEF(pj_status_t) pjmedia_codec_ffmpeg_vid_init(pjmedia_vid_codec_mgr *mgr,
(int)desc->info.encoding_name.slen,
desc->info.encoding_name.ptr,
dir_name[copied_dir],
base_desc->info.encoding_name.slen,
(int)base_desc->info.encoding_name.slen,
base_desc->info.encoding_name.ptr));
}
}

6
pjmedia/src/pjmedia/rtcp.c
View File

@ -627,8 +627,8 @@ static void parse_rtcp_report( pjmedia_rtcp_session *sess,
eedelay *= 1000;
}
TRACE_((sess->name, "Rx RTCP RR: lsr=%p, dlsr=%p (%d:%03dms), "
"now=%p, rtt=%p",
TRACE_((sess->name, "Rx RTCP RR: lsr=%u, dlsr=%u (%u:%03ums), "
"now=%u, rtt=%u",
lsr, dlsr, dlsr/65536, (dlsr%65536)*1000/65536,
now, (pj_uint32_t)eedelay));
@ -669,7 +669,7 @@ static void parse_rtcp_report( pjmedia_rtcp_session *sess,
} else {
PJ_LOG(5, (sess->name, "Internal RTCP NTP clock skew detected: "
"lsr=%p, now=%p, dlsr=%p (%d:%03dms), "
"lsr=%u, now=%u, dlsr=%u (%u:%03ums), "
"diff=%d",
lsr, now, dlsr, dlsr/65536,
(dlsr%65536)*1000/65536,

4
pjmedia/src/pjmedia/transport_ice.c
View File

@ -2256,6 +2256,7 @@ static pj_status_t transport_get_info(pjmedia_transport *tp,
pjmedia_transport_info *info)
{
struct transport_ice *tp_ice = (struct transport_ice*)tp;
pj_ice_sess_cand cands[PJ_ICE_ST_MAX_CAND];
pj_ice_sess_cand cand;
pj_sockaddr_t *addr;
pj_status_t status;
@ -2278,7 +2279,6 @@ static pj_status_t transport_get_info(pjmedia_transport *tp,
addr = &cand.addr;
} else if (pj_ice_strans_has_sess(tp_ice->ice_st)) {
unsigned i, cnt = PJ_ICE_ST_MAX_CAND;
pj_ice_sess_cand cands[PJ_ICE_ST_MAX_CAND];
pj_ice_strans_enum_cands(tp_ice->ice_st, 1, &cnt, cands);
for (i = 0; i < cnt && !addr; ++i) {
if (pj_sockaddr_has_addr(&cands[i].addr))
@ -2295,8 +2295,6 @@ static pj_status_t transport_get_info(pjmedia_transport *tp,
if (tp_ice->use_rtcp_mux) {
pj_sockaddr_cp(&info->sock_info.rtcp_addr_name, addr);
} else if (tp_ice->comp_cnt > 1) {
pj_ice_sess_cand cands[PJ_ICE_ST_MAX_CAND];
status = pj_ice_strans_get_def_cand(tp_ice->ice_st, 2, &cand);
if (status != PJ_SUCCESS)
return status;

6
pjnath/src/pjturn-client/client_main.c
View File

@ -350,12 +350,12 @@ static pj_bool_t stun_sock_on_status(pj_stun_sock *stun_sock,
struct peer *peer = (struct peer*) pj_stun_sock_get_user_data(stun_sock);
if (status == PJ_SUCCESS) {
PJ_LOG(4,(THIS_FILE, "peer%d: %s success", peer-g.peer,
PJ_LOG(4,(THIS_FILE, "peer%ld: %s success", peer-g.peer,
pj_stun_sock_op_name(op)));
} else {
char errmsg[PJ_ERR_MSG_SIZE];
pj_strerror(status, errmsg, sizeof(errmsg));
PJ_LOG(1,(THIS_FILE, "peer%d: %s error: %s", peer-g.peer,
PJ_LOG(1,(THIS_FILE, "peer%ld: %s error: %s", peer-g.peer,
pj_stun_sock_op_name(op), errmsg));
return PJ_FALSE;
}
@ -392,7 +392,7 @@ static pj_bool_t stun_sock_on_rx_data(pj_stun_sock *stun_sock,
((char*)pkt)[pkt_len] = '\0';
pj_sockaddr_print(src_addr, straddr, sizeof(straddr), 3);
PJ_LOG(3,(THIS_FILE, "peer%d: received %d bytes data from %s: %s",
PJ_LOG(3,(THIS_FILE, "peer%ld: received %d bytes data from %s: %s",
peer-g.peer, pkt_len, straddr, (char*)pkt));
return PJ_TRUE;

7
pjsip/include/pjsua2/siptypes.hpp
View File

@ -594,7 +594,7 @@ struct TsxStateEventSrc
pj_status_t status; /**< Transport error status. */
GenericData data; /**< Generic data. */
TsxStateEventSrc() : status(), data(NULL) {}
TsxStateEventSrc() : timer(NULL), status(), data(NULL) {}
};
/**
@ -765,6 +765,11 @@ struct SipHeader
string hValue;
public:
/**
* Default constructor.
*/
SipHeader();
/**
* Initiaize from PJSIP header.
*/

15
pjsip/src/pjsua2/siptypes.cpp
View File

@ -407,12 +407,20 @@ pjsip_media_type SipMediaType::toPj() const
///////////////////////////////////////////////////////////////////////////////
SipHeader::SipHeader()
{
pj_str_t dummy;
// Init pjHdr with null string to suppress warning
pj_bzero(&dummy, sizeof(dummy));
pjsip_generic_string_hdr_init2(&pjHdr, &dummy, &dummy);
}
void SipHeader::fromPj(const pjsip_hdr *hdr) PJSUA2_THROW(Error)
{
char *buf = NULL;
int len = 0;
unsigned buf_size = 256>>1;
pj_str_t dummy;
/* Print header to a 256 bytes buffer first.
* If buffer is not sufficient, try 512, 1024, soon
@ -452,10 +460,6 @@ void SipHeader::fromPj(const pjsip_hdr *hdr) PJSUA2_THROW(Error)
hName = string(buf, end_name);
hValue = string(start_val);
free(buf);
// Init pjHdr with null string to suppress warning
pj_bzero(&dummy, sizeof(dummy));
pjsip_generic_string_hdr_init2(&pjHdr, &dummy, &dummy);
}
pjsip_generic_string_hdr &SipHeader::toPj() const
@ -489,6 +493,7 @@ void SipMultipartPart::fromPj(const pjsip_multipart_part &prm)
pj_list_init(&pjMpp.hdr);
pjMpp.body = NULL;
pj_bzero(&pjMsgBody, sizeof(pjMsgBody));
}
pjsip_multipart_part& SipMultipartPart::toPj() const