From: Maximilian Fridrich <m.fridrich@commend.com>
Date: Mon, 8 Jan 2024 06:03:10 +0000 (+0100)
Subject: res_pjsip_nat: Fix potential use of uninitialized transport details
X-Git-Tag: 21.1.0-rc1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7701ba973957a39f223ca9b685a8eadce29e756;p=thirdparty%2Fasterisk.git

res_pjsip_nat: Fix potential use of uninitialized transport details

The ast_sip_request_transport_details must be zero initialized,
otherwise this could lead to a SEGV.

Resolves: #509
(cherry picked from commit 81188ada5fb3299dad3ea8107c31bcde3e39686a)
---

diff --git a/res/res_pjsip.c b/res/res_pjsip.c
index 50bb6575fa..fb0383e206 100644
--- a/res/res_pjsip.c
+++ b/res/res_pjsip.c
@@ -605,7 +605,7 @@ struct ast_sip_transport_state *ast_sip_find_transport_state_in_use(struct ast_s
 int ast_sip_rewrite_uri_to_local(pjsip_sip_uri *uri, pjsip_tx_data *tdata) {
 	RAII_VAR(struct ast_sip_transport *, transport, NULL, ao2_cleanup);
 	RAII_VAR(struct ast_sip_transport_state *, transport_state, NULL, ao2_cleanup);
-	struct ast_sip_request_transport_details details;
+	struct ast_sip_request_transport_details details = { 0, };
 	pjsip_sip_uri *tmp_uri;
 	pjsip_dialog *dlg;
 	struct ast_sockaddr addr = { { 0, } };
diff --git a/res/res_pjsip_nat.c b/res/res_pjsip_nat.c
index 62f8aa0b23..b8d4ac4cd4 100644
--- a/res/res_pjsip_nat.c
+++ b/res/res_pjsip_nat.c
@@ -319,8 +319,8 @@ static pj_status_t process_nat(pjsip_tx_data *tdata)
 {
 	RAII_VAR(struct ast_sip_transport *, transport, NULL, ao2_cleanup);
 	RAII_VAR(struct ast_sip_transport_state *, transport_state, NULL, ao2_cleanup);
+	struct ast_sip_request_transport_details details = { 0, };
 	pjsip_via_hdr *via = NULL;
-	struct ast_sip_request_transport_details details;
 	struct ast_sockaddr addr = { { 0, } };
 	pjsip_sip_uri *uri = NULL;
 	RAII_VAR(struct ao2_container *, hooks, NULL, ao2_cleanup);