From 307d8b69b2a4eea8941c7ee1310050f7efc53119 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 8 Jul 2015 11:30:44 +0200 Subject: [PATCH 1/2] Fix crash in log because of NULL --- coreapi/callbacks.c | 2 +- mediastreamer2 | 2 +- oRTP | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c index d80ab4e81..fddd8886a 100644 --- a/coreapi/callbacks.c +++ b/coreapi/callbacks.c @@ -111,7 +111,7 @@ void linphone_call_update_frozen_payloads(LinphoneCall *call, SalMediaDescriptio /*new codec, needs to be added to the list*/ local->streams[i].already_assigned_payloads=ms_list_append(local->streams[i].already_assigned_payloads, payload_type_clone(pt)); ms_message("LinphoneCall[%p] : payload type %i %s/%i fmtp=%s added to frozen list.", - call, payload_type_get_number(pt), pt->mime_type, pt->clock_rate, pt->recv_fmtp ? pt->recv_fmtp : NULL); + call, payload_type_get_number(pt), pt->mime_type, pt->clock_rate, pt->recv_fmtp ? pt->recv_fmtp : ""); } } } diff --git a/mediastreamer2 b/mediastreamer2 index 15bb0cb09..7494e580b 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 15bb0cb09255a73e2632b7e357d2b66060f2b013 +Subproject commit 7494e580b6127b950f29a5dff731789ed605b3a6 diff --git a/oRTP b/oRTP index ef3258413..d9377cb47 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit ef3258413d81f38033b15cb14362be26471d96d3 +Subproject commit d9377cb47177cd92d2a1971cd389221aeebcabde From a58201f10a003f86d1a1c2454d3da01ed4154a8e Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Sat, 1 Aug 2015 18:17:47 +0200 Subject: [PATCH 2/2] Fix crash on bb10 with current realpath use --- coreapi/lpconfig.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreapi/lpconfig.c b/coreapi/lpconfig.c index 09889d06a..a85d0c354 100644 --- a/coreapi/lpconfig.c +++ b/coreapi/lpconfig.c @@ -86,7 +86,7 @@ struct _LpConfig{ }; char* lp_realpath(const char* file, char* name) { -#ifdef _WIN32 +#if defined(_WIN32) || defined(__QNX__) return ms_strdup(file); #else char * output = realpath(file, name);