Skip to content

Commit 0dac636

Browse files
authored
Fix coverity warning (#4003)
* Fix coverity warning * Fix incorrect data supplied to pj_sockaddr_has_addr() * Change the return value to maintain the behavior
1 parent b7d125b commit 0dac636

File tree

5 files changed

+13
-5
lines changed

5 files changed

+13
-5
lines changed

pjlib/src/pjlib-test/ioq_tcp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ static int compliance_test_2(const pj_ioqueue_cfg *cfg)
887887
if (client[i].key != NULL) {
888888
pj_ioqueue_unregister(client[i].key);
889889
client[i].key = NULL;
890-
server[i].sock = PJ_INVALID_SOCKET;
890+
client[i].sock = PJ_INVALID_SOCKET;
891891
} else if (client[i].sock != PJ_INVALID_SOCKET) {
892892
pj_sock_close(client[i].sock);
893893
client[i].sock = PJ_INVALID_SOCKET;

pjmedia/src/pjmedia/endpoint.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -803,8 +803,10 @@ pjmedia_endpt_create_video_sdp(pjmedia_endpt *endpt,
803803
continue;
804804
}
805805

806-
pjmedia_vid_codec_mgr_get_default_param(NULL, &codec_info[i],
807-
&codec_param);
806+
status = pjmedia_vid_codec_mgr_get_default_param(NULL, &codec_info[i],
807+
&codec_param);
808+
if (status != PJ_SUCCESS)
809+
return status;
808810

809811
fmt = &m->desc.fmt[m->desc.fmt_count++];
810812
fmt->ptr = (char*) pj_pool_alloc(pool, 8);

pjmedia/src/pjmedia/stream.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2895,7 +2895,7 @@ PJ_DEF(pj_status_t) pjmedia_stream_create( pjmedia_endpt *endpt,
28952895
pj_sockaddr_cp(&stream->rem_rtp_addr, &info->rem_addr);
28962896
if (stream->si.rtcp_mux) {
28972897
pj_sockaddr_cp(&att_param.rem_rtcp, &info->rem_addr);
2898-
} else if (pj_sockaddr_has_addr(&info->rem_rtcp.addr)) {
2898+
} else if (pj_sockaddr_has_addr(&info->rem_rtcp)) {
28992899
pj_sockaddr_cp(&att_param.rem_rtcp, &info->rem_rtcp);
29002900
}
29012901
att_param.addr_len = pj_sockaddr_get_len(&info->rem_addr);

pjmedia/src/pjmedia/vid_stream.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2044,7 +2044,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_stream_create(
20442044
pj_sockaddr_cp(&stream->rem_rtp_addr, &info->rem_addr);
20452045
if (info->rtcp_mux) {
20462046
pj_sockaddr_cp(&att_param.rem_rtcp, &info->rem_addr);
2047-
} else if (pj_sockaddr_has_addr(&info->rem_rtcp.addr)) {
2047+
} else if (pj_sockaddr_has_addr(&info->rem_rtcp)) {
20482048
pj_sockaddr_cp(&att_param.rem_rtcp, &info->rem_rtcp);
20492049
}
20502050
att_param.addr_len = pj_sockaddr_get_len(&info->rem_addr);

pjsip/src/pjsip-ua/sip_100rel.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,12 @@ PJ_DEF(pj_status_t) pjsip_100rel_create_prack( pjsip_inv_session *inv,
269269
}
270270
rseq = (pj_uint32_t) pj_strtoul(&rseq_hdr->hvalue);
271271

272+
if (rseq < 1) {
273+
PJ_LOG(4, (dd->inv->dlg->obj_name,
274+
"Ignoring 100rel response RSeq header value less than 1"));
275+
return PJ_EIGNORED;
276+
}
277+
272278
/* Find UAC state for the specified call leg */
273279
uac_state = dd->uac_state_list;
274280
while (uac_state) {

0 commit comments

Comments
 (0)