From 28faafd1c4a350ddca4f7b4f21d07b8f97a5a47a Mon Sep 17 00:00:00 2001
From: Alexander Traud <pabstraud@compuserve.com>
Date: Fri, 30 Oct 2020 09:46:10 +0100
Subject: [PATCH] Compiler fixes for GCC when printf %s is NULL
ASTERISK-29146
Change-Id: Ib04bdad87d729f805f5fc620ef9952f58ea96d41
---
channels/chan_iax2.c | 2 +-
channels/chan_sip.c | 4 ++--
main/indications.c | 6 +++++-
res/res_stir_shaken.c | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index db4bef31bf..5a3ed803ce 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -2800,7 +2800,7 @@ static int add_calltoken_ignore(const char *addr)
int error = 0;
if (ast_strlen_zero(addr)) {
- ast_log(LOG_WARNING, "invalid calltokenoptional %s\n", addr);
+ ast_log(LOG_WARNING, "invalid calltokenoptional (null)\n");
return -1;
}
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d6f4a473e1..dc1466137c 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -28805,7 +28805,7 @@ static int handle_request_subscribe(struct sip_pvt *p, struct sip_request *req,
if (start && !found_supported) {
/* Format requested that we do not support */
transmit_response(p, "406 Not Acceptable", req);
- ast_debug(2, "Received SIP mailbox subscription for unknown format: %s\n", accept);
+ ast_debug(2, "Received SIP mailbox subscription for unknown format\n");
pvt_set_needdestroy(p, "unknown format");
if (authpeer) {
sip_unref_peer(authpeer, "sip_unref_peer, from handle_request_subscribe (authpeer 3)");
@@ -30385,7 +30385,7 @@ static void proc_422_rsp(struct sip_pvt *p, struct sip_request *rsp)
p_hdrval = sip_get_header(rsp, "Min-SE");
if (ast_strlen_zero(p_hdrval)) {
- ast_log(LOG_WARNING, "422 response without a Min-SE header %s\n", p_hdrval);
+ ast_log(LOG_WARNING, "422 response without a Min-SE header\n");
return;
}
rtn = parse_minse(p_hdrval, &minse);
diff --git a/main/indications.c b/main/indications.c
index 88cd7b4ab8..d55c2475b4 100644
--- a/main/indications.c
+++ b/main/indications.c
@@ -702,7 +702,11 @@ static char *handle_cli_indication_add(struct ast_cli_entry *e, int cmd, struct
ast_tone_zone_lock(tz);
if (ast_register_indication(tz, a->argv[3], a->argv[4])) {
- ast_log(LOG_WARNING, "Unable to register indication %s/%s\n", a->argv[2], a->argv[3]);
+ if (ast_strlen_zero(a->argv[3])) {
+ ast_log(LOG_WARNING, "Unable to register indication %s\n", a->argv[2]);
+ } else {
+ ast_log(LOG_WARNING, "Unable to register indication %s/%s\n", a->argv[2], a->argv[3]);
+ }
if (created_country) {
ast_unregister_indication_country(a->argv[2]);
}
diff --git a/res/res_stir_shaken.c b/res/res_stir_shaken.c
index 7a141f7c64..30326d36b6 100644
--- a/res/res_stir_shaken.c
+++ b/res/res_stir_shaken.c
@@ -1200,7 +1200,7 @@ static int stir_shaken_read(struct ast_channel *chan, const char *function,
*/
if (ast_strlen_zero(second)) {
ast_log(LOG_ERROR, "Retrieving a value using %s requires two paramaters (index, value) "
- "- only index was given (%s)\n", function, second);
+ "- only index was given\n", function);
return -1;
}
--
GitLab