[Asterisk-code-review] Compiler fixes for GCC when printf %s is NULL (asterisk[18])

[Friendly Automation]

Friendly Automation has submitted this change. ( https://gerrit.asterisk.org/c/asterisk/+/15110 )

Change subject: Compiler fixes for GCC when printf %s is NULL
......................................................................

Compiler fixes for GCC when printf %s is NULL

ASTERISK-29146

Change-Id: Ib04bdad87d729f805f5fc620ef9952f58ea96d41
---
M channels/chan_iax2.c
M channels/chan_sip.c
M main/indications.c
M res/res_stir_shaken.c
4 files changed, 9 insertions(+), 5 deletions(-)

Approvals:
  Kevin Harwell: Looks good to me, approved
  George Joseph: Looks good to me, but someone else must approve
  Friendly Automation: Approved for Submit



diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index db4bef3..5a3ed80 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -2800,7 +2800,7 @@
 	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 9e3365b..551997f 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -28804,7 +28804,7 @@
 		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)");
@@ -30384,7 +30384,7 @@
 
 	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 88cd7b4..d55c247 100644
--- a/main/indications.c
+++ b/main/indications.c
@@ -702,7 +702,11 @@
 	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 7a141f7..30326d36 100644
--- a/res/res_stir_shaken.c
+++ b/res/res_stir_shaken.c
@@ -1200,7 +1200,7 @@
 	 */
 	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;
 	}
 

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/15110
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 18
Gerrit-Change-Id: Ib04bdad87d729f805f5fc620ef9952f58ea96d41
Gerrit-Change-Number: 15110
Gerrit-PatchSet: 2
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: Friendly Automation
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Kevin Harwell <kharwell at digium.com>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20201103/3f6aa8fe/attachment.html>