kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-29 21:46:02 +00:00
Code Issues Projects Releases Wiki Activity

Don't segfault if the user provided a channel variable to use that doesn't exist.

Browse Source
This commit is contained in:
William King 2013-01-25 11:41:39 -08:00
parent 36492e522b
commit 233ea048c0
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/mod/xml_int/mod_xml_radius/mod_xml_radius.c
View File

@ -852,6 +852,7 @@ static switch_xml_t mod_xml_radius_directory_search(const char *section, const c
switch_status_t mod_xml_radius_check_conditions(switch_channel_t *channel, switch_xml_t conditions) { switch_status_t mod_xml_radius_check_conditions(switch_channel_t *channel, switch_xml_t conditions) {
switch_xml_t condition, param; switch_xml_t condition, param;
char *channel_var = NULL; char *channel_var = NULL;
const char *channel_val = NULL;
char *regex = NULL; char *regex = NULL;
char *anti = NULL; char *anti = NULL;
int all_matched = 1; int all_matched = 1;
@ -877,9 +878,16 @@ switch_status_t mod_xml_radius_check_conditions(switch_channel_t *channel, switc
if ( channel_var == NULL || regex == NULL ) { if ( channel_var == NULL || regex == NULL ) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Improperly constructed mod_radius condition: %s %s\n", channel_var, regex); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Improperly constructed mod_radius condition: %s %s\n", channel_var, regex);
continue;
} }
result = ( switch_regex_match( switch_channel_get_variable(channel, channel_var), regex) != SWITCH_STATUS_SUCCESS); if ( ( channel_val = switch_channel_get_variable(channel, channel_var) ) == NULL ) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
"Improperly constructed mod_radius condition, no such channel variable: %s %s\n", channel_var, regex);
continue;
}
result = ( switch_regex_match( channel_val, regex) != SWITCH_STATUS_SUCCESS);
if (( anti == NULL && result ) || ( anti != NULL && !result ) ){ if (( anti == NULL && result ) || ( anti != NULL && !result ) ){
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Didn't match: %s == %s \n", switch_channel_get_variable(channel, channel_var), regex); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Didn't match: %s == %s \n", switch_channel_get_variable(channel, channel_var), regex);
all_matched = 0; all_matched = 0;