kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

chan_sip: Fix leak using contact ACL

Browse Source 
Free old peer's contactacl before overwrite it within build_peer.

ASTERISK-28194

Change-Id: Ie580db6494e50cee0e2a44b38e568e34116ff54c
This commit is contained in:
Giuseppe Sucameli
2018-12-05 01:00:40 +01:00
parent 64b0bcacb5
commit 0bde3751a0
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
channels/chan_sip.c
View File

@@ -5317,6 +5317,7 @@ static void sip_destroy_peer(struct sip_peer *peer)
register_peer_exten(peer, FALSE); register_peer_exten(peer, FALSE);
ast_free_acl_list(peer->acl); ast_free_acl_list(peer->acl);
ast_free_acl_list(peer->contactacl);
ast_free_acl_list(peer->directmediaacl); ast_free_acl_list(peer->directmediaacl);
if (peer->selfdestruct) if (peer->selfdestruct)
ast_atomic_fetchadd_int(&apeerobjs, -1); ast_atomic_fetchadd_int(&apeerobjs, -1);
@@ -21178,6 +21179,7 @@ static char *_sip_show_peer(int type, int fd, struct mansession *s, const struct
ast_cli(fd, " Force rport : %s\n", force_rport_string(peer->flags)); ast_cli(fd, " Force rport : %s\n", force_rport_string(peer->flags));
ast_cli(fd, " Symmetric RTP: %s\n", comedia_string(peer->flags)); ast_cli(fd, " Symmetric RTP: %s\n", comedia_string(peer->flags));
ast_cli(fd, " ACL : %s\n", AST_CLI_YESNO(ast_acl_list_is_empty(peer->acl) == 0)); ast_cli(fd, " ACL : %s\n", AST_CLI_YESNO(ast_acl_list_is_empty(peer->acl) == 0));
ast_cli(fd, " ContactACL : %s\n", AST_CLI_YESNO(ast_acl_list_is_empty(peer->contactacl) == 0));
ast_cli(fd, " DirectMedACL : %s\n", AST_CLI_YESNO(ast_acl_list_is_empty(peer->directmediaacl) == 0)); ast_cli(fd, " DirectMedACL : %s\n", AST_CLI_YESNO(ast_acl_list_is_empty(peer->directmediaacl) == 0));
ast_cli(fd, " T.38 support : %s\n", AST_CLI_YESNO(ast_test_flag(&peer->flags[1], SIP_PAGE2_T38SUPPORT))); ast_cli(fd, " T.38 support : %s\n", AST_CLI_YESNO(ast_test_flag(&peer->flags[1], SIP_PAGE2_T38SUPPORT)));
ast_cli(fd, " T.38 EC mode : %s\n", faxec2str(ast_test_flag(&peer->flags[1], SIP_PAGE2_T38SUPPORT))); ast_cli(fd, " T.38 EC mode : %s\n", faxec2str(ast_test_flag(&peer->flags[1], SIP_PAGE2_T38SUPPORT)));
@@ -31524,6 +31526,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v_head
struct ast_variable *v = v_head; struct ast_variable *v = v_head;
struct sip_peer *peer = NULL; struct sip_peer *peer = NULL;
struct ast_acl_list *oldacl = NULL; struct ast_acl_list *oldacl = NULL;
struct ast_acl_list *oldcontactacl = NULL;
struct ast_acl_list *olddirectmediaacl = NULL; struct ast_acl_list *olddirectmediaacl = NULL;
int found = 0; int found = 0;
int firstpass = 1; int firstpass = 1;
@@ -31601,6 +31604,8 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v_head
if (firstpass) { if (firstpass) {
oldacl = peer->acl; oldacl = peer->acl;
peer->acl = NULL; peer->acl = NULL;
oldcontactacl = peer->contactacl;
peer->contactacl = NULL;
olddirectmediaacl = peer->directmediaacl; olddirectmediaacl = peer->directmediaacl;
peer->directmediaacl = NULL; peer->directmediaacl = NULL;
set_peer_defaults(peer); /* Set peer defaults */ set_peer_defaults(peer); /* Set peer defaults */
@@ -32283,6 +32288,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v_head
peer->the_mark = 0; peer->the_mark = 0;
oldacl = ast_free_acl_list(oldacl); oldacl = ast_free_acl_list(oldacl);
oldcontactacl = ast_free_acl_list(oldcontactacl);
olddirectmediaacl = ast_free_acl_list(olddirectmediaacl); olddirectmediaacl = ast_free_acl_list(olddirectmediaacl);
if (!ast_strlen_zero(peer->callback)) { /* build string from peer info */ if (!ast_strlen_zero(peer->callback)) { /* build string from peer info */
char *reg_string; char *reg_string;