From 1062cd83643f48d3bc726275ef796bb20640576c Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Wed, 11 Oct 2023 12:37:29 -0400
Subject: [PATCH] MT#55283 fix possible NULL dereferences

Change-Id: I4abd23c834d133c8f20f0a8038a78aa214cbc879
(cherry picked from commit 5171fd890190f6c3e1238487e913699a73166518)
---
 daemon/call.c | 24 ++++++++++++++++--------
 daemon/rtcp.c |  2 ++
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/daemon/call.c b/daemon/call.c
index 4db15430a0..c089eb2885 100644
--- a/daemon/call.c
+++ b/daemon/call.c
@@ -2628,27 +2628,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;
diff --git a/daemon/rtcp.c b/daemon/rtcp.c
index 7ea217aad4..645de73ba7 100644
--- a/daemon/rtcp.c
+++ b/daemon/rtcp.c
@@ -1322,6 +1322,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