recursion protection

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5040 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/include/private/switch_core.h b/src/include/private/switch_core.h
index 721c4789dd09a9f6ec1c906e28571197d23eebaa..8643a4f6c88e848bbb88f2bc84f9a2dce90de8e6 100644 (file)
--- a/src/include/private/switch_core.h
+++ b/src/include/private/switch_core.h
@@ -127,6 +127,7 @@ struct switch_core_session {
        switch_thread_rwlock_t *bug_rwlock;
        switch_media_bug_t *bugs;
        switch_app_log_t *app_log;
+       uint32_t stack_count;
 };
 
 struct switch_media_bug {

diff --git a/src/include/switch_types.h b/src/include/switch_types.h
index 7f494d532e2c9b8b43bd456b505ba2e42208a4d9..38237e54fade94601201fa943e9ffa18a54ed77d 100644 (file)
--- a/src/include/switch_types.h
+++ b/src/include/switch_types.h
@@ -229,6 +229,7 @@ struct switch_directories {
 typedef struct switch_directories switch_directories;
 SWITCH_DECLARE_DATA extern switch_directories SWITCH_GLOBAL_dirs;
 
+#define SWITCH_MAX_STACKS 32
 #define SWITCH_THREAD_STACKSIZE 240 * 1024
 #define SWITCH_RECOMMENDED_BUFFER_SIZE 3968
 #define SWITCH_MAX_CODECS 30

diff --git a/src/switch_core_session.c b/src/switch_core_session.c
index 96b1589ed206b7f64ee00c27df375c4ef538d0b4..052e4f2cd3bb9ee28c97143a1488120314fd0718 100644 (file)
--- a/src/switch_core_session.c
+++ b/src/switch_core_session.c
@@ -921,13 +921,21 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_execute_exten(switch_core_se
        switch_caller_extension_t *extension = NULL;
        const switch_application_interface_t *application_interface;
        switch_event_t *event;
+       switch_status_t status = SWITCH_STATUS_SUCCESS;
        
        channel = switch_core_session_get_channel(session);
-       
+
        if (!(profile = switch_channel_get_caller_profile(channel))) {
-               return SWITCH_STATUS_SUCCESS;
+               return SWITCH_STATUS_FALSE;
+       }
+       
+       if (session->stack_count > SWITCH_MAX_STACKS) {
+               switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error %s too many stacked extensions\n", switch_channel_get_name(session->channel));
+               return SWITCH_STATUS_FALSE;
        }
 
+       session->stack_count++;
+       
        new_profile = switch_caller_profile_clone(session, profile);
        new_profile->destination_number = switch_core_session_strdup(session, exten);
                
@@ -965,7 +973,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_execute_exten(switch_core_se
        }
        
        if (!extension) {
-               return SWITCH_STATUS_FALSE;
+               status = SWITCH_STATUS_FALSE;
+               goto done;
        }
 
        new_profile->caller_extension = extension;
@@ -983,18 +992,21 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_execute_exten(switch_core_se
                                                  extension->current_application->application_name, switch_str_nil(extension->current_application->application_data));
                if ((application_interface = switch_loadable_module_get_application_interface(extension->current_application->application_name)) == 0) {
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Application %s\n", extension->current_application->application_name);
-                       return SWITCH_STATUS_FALSE;
+                       status = SWITCH_STATUS_FALSE;
+                       goto done;
                }
 
                if (switch_channel_test_flag(session->channel, CF_NOMEDIA) && !switch_test_flag(application_interface, SAF_SUPPORT_NOMEDIA)) {
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Application %s Cannot be used with NO_MEDIA mode!\n",
                                                          extension->current_application->application_name);
-                       return SWITCH_STATUS_FALSE;
+                       status = SWITCH_STATUS_FALSE;
+                       goto done;
                }
        
                if (!application_interface->application_function) {
                        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Function for %s\n", extension->current_application->application_name);
-                       return SWITCH_STATUS_FALSE;
+                       status = SWITCH_STATUS_FALSE;
+                       goto done;
                }
 
                if ((expanded =
@@ -1030,7 +1042,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_execute_exten(switch_core_se
                extension->current_application = extension->current_application->next;          
        }
 
-       return SWITCH_STATUS_SUCCESS;
+ done:
+
+       session->stack_count--;
+
+       return status;
        
 }