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

Merge pull request #1528 from signalwire/multicast_overflow

Browse Source 
[mod_event_multicast] Fix buffer overflow on module load.
This commit is contained in:
Andrey Volk 2022-01-26 20:14:03 +03:00 committed by GitHub
commit 351b505535
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mod/event_handlers/mod_event_multicast/mod_event_multicast.c
View File

@ -290,7 +290,7 @@ static switch_status_t initialize_sockets(switch_xml_t input_cfg)
dst_host_count = switch_separate_string(globals.dst_addrs, ',', dst_hosts, MAX_DST_HOSTS); dst_host_count = switch_separate_string(globals.dst_addrs, ',', dst_hosts, MAX_DST_HOSTS);
for (i = 0; i < dst_host_count; i++) { for (i = 0; i < dst_host_count; i++) {
char *ip_addr_groups[8] = { 0 }; char *ip_addr_groups[8] = { 0 };
char host_string[sizeof(dst_hosts[i])]; char *host_string;
char ipv6_first_octet[3]; char ipv6_first_octet[3];
memset(&globals.dst_sockaddrs[globals.num_dst_addrs].sockaddr, 0, sizeof(dst_sockaddr_t)); memset(&globals.dst_sockaddrs[globals.num_dst_addrs].sockaddr, 0, sizeof(dst_sockaddr_t));
@ -315,7 +315,8 @@ static switch_status_t initialize_sockets(switch_xml_t input_cfg)
} }
/* flag this address with the address type */ /* flag this address with the address type */
strcpy(host_string, dst_hosts[i]); host_string = strdup(dst_hosts[i]);
if (switch_sockaddr_get_family(globals.dst_sockaddrs[globals.num_dst_addrs].sockaddr) == SWITCH_INET) { if (switch_sockaddr_get_family(globals.dst_sockaddrs[globals.num_dst_addrs].sockaddr) == SWITCH_INET) {
globals.has_udp = 1; globals.has_udp = 1;
switch_separate_string(host_string, '.', ip_addr_groups, sizeof(ip_addr_groups) / sizeof(ip_addr_groups[0])); switch_separate_string(host_string, '.', ip_addr_groups, sizeof(ip_addr_groups) / sizeof(ip_addr_groups[0]));
@ -347,6 +348,7 @@ static switch_status_t initialize_sockets(switch_xml_t input_cfg)
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Added %s peer: %s", addr_type_names[globals.dst_sockaddrs[globals.num_dst_addrs].addrtype], dst_hosts[i]); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Added %s peer: %s", addr_type_names[globals.dst_sockaddrs[globals.num_dst_addrs].addrtype], dst_hosts[i]);
globals.dst_sockaddrs[globals.num_dst_addrs].ipaddr = switch_core_strdup(module_pool, dst_hosts[i]); globals.dst_sockaddrs[globals.num_dst_addrs].ipaddr = switch_core_strdup(module_pool, dst_hosts[i]);
globals.num_dst_addrs++; globals.num_dst_addrs++;
switch_safe_free(host_string);
} }
/* create IPv4 source socket */ /* create IPv4 source socket */