Browse Source

MT#55283 fix possible NULL dereferences

Change-Id: I4abd23c834d133c8f20f0a8038a78aa214cbc879
pull/1747/head
Richard Fuchs 2 years ago
parent
commit
5171fd8901
2 changed files with 18 additions and 8 deletions
  1. +16
    -8
      daemon/call.c
  2. +2
    -0
      daemon/rtcp.c

+ 16
- 8
daemon/call.c View File

@ -2650,27 +2650,35 @@ static void __media_init_from_flags(struct call_media *other_media, struct call_
if (flags) {
switch (flags->media_echo) {
case MEO_FWD:
MEDIA_SET(media, ECHO);
if (media) {
MEDIA_SET(media, ECHO);
MEDIA_CLEAR(media, BLACKHOLE);
}
MEDIA_SET(other_media, BLACKHOLE);
MEDIA_CLEAR(media, BLACKHOLE);
MEDIA_CLEAR(other_media, ECHO);
break;
case MEO_BKW:
MEDIA_SET(media, BLACKHOLE);
if (media) {
MEDIA_SET(media, BLACKHOLE);
MEDIA_CLEAR(media, ECHO);
}
MEDIA_SET(other_media, ECHO);
MEDIA_CLEAR(media, ECHO);
MEDIA_CLEAR(other_media, BLACKHOLE);
break;
case MEO_BOTH:
MEDIA_SET(media, ECHO);
if (media) {
MEDIA_SET(media, ECHO);
MEDIA_CLEAR(media, BLACKHOLE);
}
MEDIA_SET(other_media, ECHO);
MEDIA_CLEAR(media, BLACKHOLE);
MEDIA_CLEAR(other_media, BLACKHOLE);
break;
case MEO_BLACKHOLE:
MEDIA_SET(media, BLACKHOLE);
if (media) {
MEDIA_SET(media, BLACKHOLE);
MEDIA_CLEAR(media, ECHO);
}
MEDIA_SET(other_media, BLACKHOLE);
MEDIA_CLEAR(media, ECHO);
MEDIA_CLEAR(other_media, ECHO);
case MEO_DEFAULT:
break;


+ 2
- 0
daemon/rtcp.c View File

@ -1319,6 +1319,8 @@ static void transcode_rr(struct rtcp_process_ctx *ctx, struct report_block *rr)
struct ssrc_ctx *input_ctx = get_ssrc_ctx(map_ctx->ssrc_map_out,
ctx->mp->media_out->monologue->ssrc_hash,
SSRC_DIR_INPUT, NULL);
if (!input_ctx)
return;
// substitute our own values


Loading…
Cancel
Save