Skip to content

Commit

Permalink
Fixed Coverity warnings (#4305)
Browse files Browse the repository at this point in the history
  • Loading branch information
@sauwming
sauwming authored Feb 14, 2025
1 parent e533af2 commit 139203b
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 18 deletions.
20 changes: 10 additions & 10 deletions pjmedia/src/pjmedia/stream.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2403,7 +2403,7 @@ static void on_stream_destroy(void *arg)
*/
PJ_DEF(pj_status_t) pjmedia_stream_destroy( pjmedia_stream *stream )
{
pjmedia_stream_common *c_strm = (stream? &stream->base: NULL);
pjmedia_stream_common *c_strm = (pjmedia_stream_common *)stream;
pj_status_t status;

PJ_ASSERT_RETURN(stream != NULL, PJ_EINVAL);
Expand Down Expand Up @@ -2530,7 +2530,7 @@ PJ_DEF(pjmedia_transport*) pjmedia_stream_get_transport(pjmedia_stream *st)
*/
PJ_DEF(pj_status_t) pjmedia_stream_start(pjmedia_stream *stream)
{
pjmedia_stream_common *c_strm = (stream? &stream->base: NULL);
pjmedia_stream_common *c_strm = (pjmedia_stream_common *)stream;

PJ_ASSERT_RETURN(stream && c_strm->enc && c_strm->dec, PJ_EINVALIDOP);

Expand Down Expand Up @@ -2602,7 +2602,7 @@ PJ_DEF(pj_status_t) pjmedia_stream_reset_stat(pjmedia_stream *stream)
PJ_DEF(pj_status_t) pjmedia_stream_get_stat_xr( const pjmedia_stream *stream,
pjmedia_rtcp_xr_stat *stat)
{
const pjmedia_stream_common *c_strm = (stream? &stream->base: NULL);
const pjmedia_stream_common *c_strm = (pjmedia_stream_common *)stream;

PJ_ASSERT_RETURN(stream && stat, PJ_EINVAL);

Expand All @@ -2620,7 +2620,7 @@ PJ_DEF(pj_status_t) pjmedia_stream_get_stat_xr( const pjmedia_stream *stream,
PJ_DEF(pj_status_t) pjmedia_stream_get_stat_jbuf(const pjmedia_stream *stream,
pjmedia_jb_state *state)
{
const pjmedia_stream_common *c_strm = (stream? &stream->base: NULL);
const pjmedia_stream_common *c_strm = (pjmedia_stream_common *)stream;

PJ_ASSERT_RETURN(stream && state, PJ_EINVAL);
return pjmedia_jbuf_get_state(c_strm->jb, state);
Expand All @@ -2632,7 +2632,7 @@ PJ_DEF(pj_status_t) pjmedia_stream_get_stat_jbuf(const pjmedia_stream *stream,
PJ_DEF(pj_status_t) pjmedia_stream_pause( pjmedia_stream *stream,
pjmedia_dir dir)
{
pjmedia_stream_common *c_strm = (stream? &stream->base: NULL);
pjmedia_stream_common *c_strm = (pjmedia_stream_common *)stream;

PJ_ASSERT_RETURN(stream, PJ_EINVAL);

Expand Down Expand Up @@ -2662,7 +2662,7 @@ PJ_DEF(pj_status_t) pjmedia_stream_pause( pjmedia_stream *stream,
PJ_DEF(pj_status_t) pjmedia_stream_resume( pjmedia_stream *stream,
pjmedia_dir dir)
{
pjmedia_stream_common *c_strm = (stream? &stream->base: NULL);
pjmedia_stream_common *c_strm = (pjmedia_stream_common *)stream;

PJ_ASSERT_RETURN(stream, PJ_EINVAL);

Expand Down Expand Up @@ -2693,7 +2693,7 @@ PJ_DEF(pj_status_t) pjmedia_stream_dial_dtmf2( pjmedia_stream *stream,
const pj_str_t *digit_char,
unsigned duration)
{
pjmedia_stream_common *c_strm = (stream? &stream->base: NULL);
pjmedia_stream_common *c_strm = (pjmedia_stream_common *)stream;
pj_status_t status = PJ_SUCCESS;

/* By convention we use jitter buffer mutex to access DTMF
Expand Down Expand Up @@ -2786,7 +2786,7 @@ PJ_DEF(pj_status_t) pjmedia_stream_get_dtmf( pjmedia_stream *stream,
char *digits,
unsigned *size)
{
pjmedia_stream_common *c_strm = (stream? &stream->base: NULL);
pjmedia_stream_common *c_strm = (pjmedia_stream_common *)stream;

PJ_ASSERT_RETURN(stream && digits && size, PJ_EINVAL);

Expand Down Expand Up @@ -2823,7 +2823,7 @@ PJ_DEF(pj_status_t) pjmedia_stream_set_dtmf_callback(pjmedia_stream *stream,
int digit),
void *user_data)
{
pjmedia_stream_common *c_strm = (stream? &stream->base: NULL);
pjmedia_stream_common *c_strm = (pjmedia_stream_common *)stream;

PJ_ASSERT_RETURN(stream, PJ_EINVAL);

Expand All @@ -2846,7 +2846,7 @@ PJ_DEF(pj_status_t) pjmedia_stream_set_dtmf_event_callback(pjmedia_stream *strea
const pjmedia_stream_dtmf_event *event),
void *user_data)
{
pjmedia_stream_common *c_strm = (stream? &stream->base: NULL);
pjmedia_stream_common *c_strm = (pjmedia_stream_common *)stream;

PJ_ASSERT_RETURN(stream, PJ_EINVAL);

Expand Down
3 changes: 2 additions & 1 deletion pjmedia/src/pjmedia/stream_imp_common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -446,14 +446,15 @@ static void on_rx_rtp( pjmedia_tp_cb_param *param)
/* Add ref counter to avoid premature destroy from callbacks */
pj_grp_lock_add_ref(c_strm->grp_lock);

pj_bzero(&seq_st, sizeof(seq_st));

/* Ignore the packet if decoder is paused */
if (channel->paused)
goto on_return;

/* Update RTP session (also checks if RTP session can accept
* the incoming packet.
*/
pj_bzero(&seq_st, sizeof(seq_st));
check_pt = PJMEDIA_STREAM_CHECK_RTP_PT;
#ifdef AUDIO_STREAM
check_pt = check_pt && hdr->pt != stream->rx_event_pt;
Expand Down
15 changes: 8 additions & 7 deletions pjmedia/src/pjmedia/vid_stream.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1527,10 +1527,11 @@ PJ_DEF(pj_status_t) pjmedia_vid_stream_create(
*/
PJ_DEF(pj_status_t) pjmedia_vid_stream_destroy( pjmedia_vid_stream *stream )
{
pjmedia_stream_common *c_strm = (stream? &stream->base: NULL);
pjmedia_stream_common *c_strm;

PJ_ASSERT_RETURN(stream != NULL, PJ_EINVAL);

c_strm = &stream->base;
PJ_LOG(4,(THIS_FILE, "Destroy request on %s..", c_strm->name.ptr));

/* Stop the streaming */
Expand Down Expand Up @@ -1610,7 +1611,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_stream_get_port(pjmedia_vid_stream *stream,
pjmedia_dir dir,
pjmedia_port **p_port )
{
pjmedia_stream_common *c_strm = (stream? &stream->base: NULL);
pjmedia_stream_common *c_strm = (pjmedia_stream_common *)stream;

PJ_ASSERT_RETURN(dir==PJMEDIA_DIR_ENCODING || dir==PJMEDIA_DIR_DECODING,
PJ_EINVAL);
Expand Down Expand Up @@ -1691,7 +1692,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_stream_get_info(
*/
PJ_DEF(pj_status_t) pjmedia_vid_stream_start(pjmedia_vid_stream *stream)
{
pjmedia_stream_common *c_strm = (stream? &stream->base: NULL);
pjmedia_stream_common *c_strm = (pjmedia_stream_common *)stream;

PJ_ASSERT_RETURN(stream && c_strm->enc && c_strm->dec, PJ_EINVALIDOP);

Expand Down Expand Up @@ -1734,7 +1735,7 @@ pjmedia_vid_stream_modify_codec_param(pjmedia_vid_stream *stream,
PJ_DEF(pj_bool_t) pjmedia_vid_stream_is_running(pjmedia_vid_stream *stream,
pjmedia_dir dir)
{
pjmedia_stream_common *c_strm = (stream? &stream->base: NULL);
pjmedia_stream_common *c_strm = (pjmedia_stream_common *)stream;
pj_bool_t is_running = PJ_TRUE;

PJ_ASSERT_RETURN(stream, PJ_FALSE);
Expand All @@ -1756,7 +1757,7 @@ PJ_DEF(pj_bool_t) pjmedia_vid_stream_is_running(pjmedia_vid_stream *stream,
PJ_DEF(pj_status_t) pjmedia_vid_stream_pause(pjmedia_vid_stream *stream,
pjmedia_dir dir)
{
pjmedia_stream_common *c_strm = (stream? &stream->base: NULL);
pjmedia_stream_common *c_strm = (pjmedia_stream_common *)stream;

PJ_ASSERT_RETURN(stream, PJ_EINVAL);

Expand Down Expand Up @@ -1786,7 +1787,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_stream_pause(pjmedia_vid_stream *stream,
PJ_DEF(pj_status_t) pjmedia_vid_stream_resume(pjmedia_vid_stream *stream,
pjmedia_dir dir)
{
pjmedia_stream_common *c_strm = (stream? &stream->base: NULL);
pjmedia_stream_common *c_strm = (pjmedia_stream_common *)stream;

PJ_ASSERT_RETURN(stream, PJ_EINVAL);

Expand Down Expand Up @@ -1860,7 +1861,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_stream_send_rtcp_bye(
PJ_DEF(pj_status_t) pjmedia_vid_stream_send_rtcp_pli(
pjmedia_vid_stream *stream)
{
pjmedia_stream_common *c_strm = (stream? &stream->base: NULL);
pjmedia_stream_common *c_strm = (pjmedia_stream_common *)stream;

PJ_ASSERT_RETURN(stream, PJ_EINVAL);

Expand Down
1 change: 1 addition & 0 deletions pjsip/include/pjsua2/account.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,7 @@ struct AccountNatConfig : public PersistentObject
iceAggressiveNomination(true),
iceNominatedCheckDelayMsec(PJ_ICE_NOMINATED_CHECK_DELAY),
iceWaitNominationTimeoutMsec(ICE_CONTROLLED_AGENT_WAIT_NOMINATION_TIMEOUT),
iceCheckSrcAddr(PJ_ICE_SESS_CHECK_SRC_ADDR),
iceNoRtcp(false),
iceAlwaysUpdate(true),
turnEnabled(false),
Expand Down
5 changes: 5 additions & 0 deletions pjsip/src/pjsua-lib/pjsua_media.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3940,6 +3940,11 @@ static pj_status_t apply_med_update(pjsua_call_media *call_med,
pjsua_stream_info stream_info;
pj_str_t *enc_name = NULL;

/* Sanity check. */
PJ_ASSERT_RETURN(call_med->type == PJMEDIA_TYPE_AUDIO ||
call_med->type == PJMEDIA_TYPE_VIDEO,
PJ_EINVAL);

if (call_med->type == PJMEDIA_TYPE_AUDIO) {
si = (pjmedia_stream_info_common *)&asi;
status = pjmedia_stream_info_from_sdp(
Expand Down

0 comments on commit 139203b

Please sign in to comment.