FS-10637: [core] FreeSWITCH crash in 'enterprise originate' API caused due to fix...

diff --git a/src/switch_ivr_originate.c b/src/switch_ivr_originate.c
index e3944e7cb984d55c8ce08bbce5a229810695a947..1b4b1f34b7dfb7e18cbe695d7d1fea8e1f5b6a32 100644 (file)
--- a/src/switch_ivr_originate.c
+++ b/src/switch_ivr_originate.c
@@ -1672,12 +1672,14 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_enterprise_originate(switch_core_sess
                *bleg = hp->bleg;
                if (*bleg) {
                        switch_channel_t *bchan = switch_core_session_get_channel(*bleg);
-                       switch_caller_profile_t *cloned_profile, *peer_profile = switch_channel_get_caller_profile(switch_core_session_get_channel(*bleg));
-                       if (peer_profile && (cloned_profile = switch_caller_profile_clone(session, peer_profile))) {
-                               switch_channel_set_originatee_caller_profile(channel, cloned_profile);
-                       }
-                       if (bchan && cp && (cloned_profile = switch_caller_profile_clone(*bleg, cp))) {
+                       switch_caller_profile_t *cloned_profile;
+
+                       if (session) {
+                               cloned_profile = switch_caller_profile_clone(*bleg, cp);
                                switch_channel_set_originator_caller_profile(bchan, cloned_profile);
+                               
+                               cloned_profile = switch_caller_profile_clone(session, switch_channel_get_caller_profile(bchan));
+                               switch_channel_set_originatee_caller_profile(channel, cloned_profile);
                        }
                }
                switch_mutex_unlock(hp->mutex);