From 7a2cc53991d12a3aaac60f712e1ba09249476864 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Fri, 16 Oct 2015 15:09:43 +0200 Subject: [PATCH] Fix other bb10 crashes with NULL %s --- coreapi/authentication.c | 2 +- coreapi/quality_reporting.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coreapi/authentication.c b/coreapi/authentication.c index b0318bc99..5382347ad 100644 --- a/coreapi/authentication.c +++ b/coreapi/authentication.c @@ -275,7 +275,7 @@ const LinphoneAuthInfo *_linphone_core_find_auth_info(LinphoneCore *lc, const ch if (ai==NULL){ ai=find_auth_info(lc,username,NULL,NULL, ignore_realm); } - if (ai) ms_message("linphone_core_find_auth_info(): returning auth info username=%s, realm=%s", ai->username, ai->realm); + if (ai) ms_message("linphone_core_find_auth_info(): returning auth info username=%s, realm=%s", ai->username ? ai->username : "", ai->realm ? ai->realm : ""); return ai; } diff --git a/coreapi/quality_reporting.c b/coreapi/quality_reporting.c index a7b98b8b2..f0f7615d3 100644 --- a/coreapi/quality_reporting.c +++ b/coreapi/quality_reporting.c @@ -496,13 +496,13 @@ void linphone_reporting_update_media_info(LinphoneCall * call, int stats_type) { // RFC states: "LocalGroupID provides the identification for the purposes // of aggregation for the local endpoint.". STR_REASSIGN(report->info.local_addr.group, ms_strdup_printf("%s-%s-%s" - , dialog_id + , dialog_id ? dialog_id : "" , "local" , report->local_metrics.user_agent ? report->local_metrics.user_agent : "" ) ); STR_REASSIGN(report->info.remote_addr.group, ms_strdup_printf("%s-%s-%s" - , dialog_id + , dialog_id ? dialog_id : "" , "remote" , report->remote_metrics.user_agent ? report->remote_metrics.user_agent : "" ) @@ -553,7 +553,7 @@ void linphone_reporting_update_media_info(LinphoneCall * call, int stats_type) { } } - STR_REASSIGN(report->dialog_id, ms_strdup_printf("%s;%u", dialog_id, report->info.local_addr.ssrc)); + STR_REASSIGN(report->dialog_id, ms_strdup_printf("%s;%u", dialog_id ? dialog_id : "", report->info.local_addr.ssrc)); if (local_payload != NULL) { report->local_metrics.session_description.payload_type = local_payload->type;