FS-5717 --resolve

Conflicts:
	src/mod/endpoints/mod_sofia/mod_sofia.c

diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 7ecab34f4f81bb712ae06cda646ba6ee00c059d3..977133af16d40fb168b27a4fe9db78a9fb6420cc 100644 (file)
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -2363,9 +2363,18 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
                break;
        case SWITCH_MESSAGE_INDICATE_DISPLAY:
                {
-                       const char *name = msg->string_array_arg[0], *number = msg->string_array_arg[1];
-                       const char *call_info = switch_channel_get_variable(channel, "presence_call_info_full");
-                       
+                       const char *name = NULL, *number = NULL;
+                       const char *call_info = NULL;
+
+                       if (!sofia_test_pflag(tech_pvt->profile, PFLAG_SEND_DISPLAY_UPDATE)) {
+                               goto end_lock;
+                       }
+
+                       name = msg->string_array_arg[0];
+                       number = msg->string_array_arg[1];
+                       call_info = switch_channel_get_variable(channel, "presence_call_info_full");
+
+
                        if (!zstr(name)) {
                                char message[256] = "";
                                const char *ua = switch_channel_get_variable(tech_pvt->channel, "sip_user_agent");