Merge branch 'coverity01' of https://github.com/pjsip/pjproject into coverity01

This commit is contained in:
bennylp 2023-02-21 18:25:09 +07:00
commit 74c07aa476
13 changed files with 24 additions and 11 deletions

View File

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

View File

@ -1803,6 +1803,7 @@ static pj_status_t telnet_start(cli_telnet_fe *fe)
unsigned msec;
/* Start telnet daemon */
fe->asock = NULL;
status = pj_sock_socket(pj_AF_INET(), pj_SOCK_STREAM(), 0, &sock);
if (status != PJ_SUCCESS)

View File

@ -868,6 +868,7 @@ PJ_DEF(pj_status_t) pjmedia_tonegen_play_digits( pjmedia_port *port,
tones[i].on_msec = digits[i].on_msec;
tones[i].off_msec = digits[i].off_msec;
tones[i].volume = digits[i].volume;
tones[i].flags = 0;
}
pj_lock_release(tonegen->lock);

View File

@ -739,6 +739,8 @@ PJ_DEF(pj_status_t) pjmedia_transport_srtp_create(
int cs_idx = get_crypto_idx(&opt->crypto[i].name);
pj_str_t tmp_key = opt->crypto[i].key;
if (cs_idx == -1) continue;
/* re-set crypto */
srtp->setting.crypto[i].name = pj_str(crypto_suites[cs_idx].name);
/* cut key length */

View File

@ -213,8 +213,9 @@ PJ_DEF(pj_status_t) pj_stun_detect_nat_type(const pj_sockaddr_in *server,
{
pj_sockaddr srv;
if (server)
pj_sockaddr_cp(&srv, server);
PJ_ASSERT_RETURN(server, PJ_EINVAL);
pj_sockaddr_cp(&srv, server);
return pj_stun_detect_nat_type2(&srv, stun_cfg, user_data, cb);
}

View File

@ -979,6 +979,8 @@ static pj_status_t cmd_add_buddy(pj_cli_cmd_val *cval)
pj_ansi_snprintf(out_str, sizeof(out_str),
"New buddy '%s' added at index %d\n",
cval->argv[1].ptr, buddy_id+1);
} else {
pj_ansi_snprintf(out_str, sizeof(out_str), "Add buddy failed\n");
}
}
pj_cli_sess_write_msg(cval->sess, out_str, pj_ansi_strlen(out_str));

View File

@ -1068,7 +1068,7 @@ static pj_status_t create_sdp( pj_pool_t *pool,
rtpmap.pt = m->desc.fmt[0];
rtpmap.clock_rate = app.audio_codec.clock_rate;
rtpmap.enc_name = pj_str(app.audio_codec.name);
rtpmap.param.slen = 0;
pj_bzero(&rtpmap.param, sizeof(pj_str_t));
pjmedia_sdp_rtpmap_to_attr(pool, &rtpmap, &attr);
m->attr[m->attr_count++] = attr;

View File

@ -771,13 +771,13 @@ PJ_DEF(pjsip_generic_string_hdr*) pjsip_generic_string_hdr_init(pj_pool_t *pool,
if (hnames) {
pj_strdup(pool, &dup_hname, hnames);
} else {
dup_hname.slen = 0;
pj_bzero(&dup_hname, sizeof(pj_str_t));
}
if (hvalue) {
pj_strdup(pool, &dup_hval, hvalue);
} else {
dup_hval.slen = 0;
pj_bzero(&dup_hval, sizeof(pj_str_t));
}
pjsip_generic_string_hdr_init2(hdr, &dup_hname, &dup_hval);

View File

@ -3519,7 +3519,7 @@ pj_status_t pjsua_acc_get_uac_addr(pjsua_acc_id acc_id,
{
int i;
for (i = 0; i < sizeof(pjsua_var.tpdata); i++) {
for (i = 0; i < PJ_ARRAY_SIZE(pjsua_var.tpdata); i++) {
if (tfla2_prm.ret_tp==(const void *)pjsua_var.tpdata[i].data.tp) {
if (pjsua_var.tpdata[i].has_bound_addr) {
pj_strdup(pool, &addr->host,

View File

@ -2556,7 +2556,7 @@ PJ_DEF(pj_status_t) pjsua_transport_create( pjsip_transport_type_e type,
if (status != PJ_SUCCESS)
goto on_return;
pj_ansi_strcpy(hostbuf, addr_string(&pub_addr));
pj_ansi_strncpy(hostbuf, addr_string(&pub_addr), sizeof(hostbuf));
addr_name.host = pj_str(hostbuf);
addr_name.port = pj_sockaddr_get_port(&pub_addr);
@ -3024,7 +3024,7 @@ PJ_DEF(pj_status_t) pjsua_transport_lis_start(pjsua_transport_id id,
int af = pjsip_transport_type_get_af(factory->type);
if (cfg->port)
pj_sockaddr_set_port(&bind_addr, (pj_uint16_t)cfg->port);
pj_sockaddr_init(af, &bind_addr, NULL, (pj_uint16_t)cfg->port);
if (cfg->bound_addr.slen) {
status = pj_sockaddr_set_str_addr(af,
@ -3039,6 +3039,7 @@ PJ_DEF(pj_status_t) pjsua_transport_lis_start(pjsua_transport_id id,
}
/* Set published name */
pj_bzero(&addr_name, sizeof(pjsip_host_port));
if (cfg->public_addr.slen)
addr_name.host = cfg->public_addr;

View File

@ -722,6 +722,7 @@ void AccountConfig::toPj(pjsua_acc_config &ret) const
void AccountConfig::fromPj(const pjsua_acc_config &prm,
const pjsua_media_config *mcfg)
{
pjsua_media_config default_mcfg;
const pjsip_hdr *hdr;
unsigned i;
@ -825,7 +826,6 @@ void AccountConfig::fromPj(const pjsua_acc_config &prm,
natConfig.iceNoRtcp = PJ2BOOL(prm.ice_cfg.ice_no_rtcp);
natConfig.iceAlwaysUpdate = PJ2BOOL(prm.ice_cfg.ice_always_update);
} else {
pjsua_media_config default_mcfg;
if (!mcfg) {
pjsua_media_config_default(&default_mcfg);
mcfg = &default_mcfg;
@ -852,7 +852,6 @@ void AccountConfig::fromPj(const pjsua_acc_config &prm,
natConfig.turnPassword =
pj2Str(prm.turn_cfg.turn_auth_cred.data.static_cred.data);
} else {
pjsua_media_config default_mcfg;
if (!mcfg) {
pjsua_media_config_default(&default_mcfg);
mcfg = &default_mcfg;

View File

@ -714,6 +714,7 @@ void AudDevManager::setCaptureDev(int capture_dev) const PJSUA2_THROW(Error)
{
pjsua_snd_dev_param param;
pjsua_snd_dev_param_default(&param);
PJSUA2_CHECK_EXPR(pjsua_get_snd_dev2(&param));
param.capture_dev = capture_dev;
@ -733,6 +734,7 @@ void AudDevManager::setPlaybackDev(int playback_dev) const PJSUA2_THROW(Error)
{
pjsua_snd_dev_param param;
pjsua_snd_dev_param_default(&param);
PJSUA2_CHECK_EXPR(pjsua_get_snd_dev2(&param));
param.playback_dev = playback_dev;
@ -799,6 +801,7 @@ void AudDevManager::setSndDevMode(unsigned mode) const PJSUA2_THROW(Error)
{
pjsua_snd_dev_param param;
pjsua_snd_dev_param_default(&param);
PJSUA2_CHECK_EXPR(pjsua_get_snd_dev2(&param));
param.mode = mode;
PJSUA2_CHECK_EXPR( pjsua_set_snd_dev2(&param) );

View File

@ -486,6 +486,9 @@ void SipMultipartPart::fromPj(const pjsip_multipart_part &prm)
contentType.fromPj(prm.body->content_type);
body = string((char*)prm.body->data, prm.body->len);
pj_list_init(&pjMpp.hdr);
pjMpp.body = NULL;
}
pjsip_multipart_part& SipMultipartPart::toPj() const