diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-07 15:43:39 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-02-07 15:43:39 +0000 |
commit | fa5d8a3e2aebd7592f15fb11b0b7b9900849bc2d (patch) | |
tree | 96c9ae7a298a621cac07b293b58cde75e1035179 /channels | |
parent | 082fc16b8e66094e0663846c53bc385468ee945e (diff) |
Merged revisions 53357 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r53357 | file | 2007-02-07 10:38:48 -0500 (Wed, 07 Feb 2007) | 2 lines
Fix a few potential memory leaks with realtime users and peers. (issue #8999 reported by bsmithurst)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@53358 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r-- | channels/chan_iax2.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 29031796d..923970e1a 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -2446,8 +2446,10 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in peer = build_peer(peername, var, NULL, ast_test_flag((&globalflags), IAX_RTCACHEFRIENDS) ? 0 : 1); - if (!peer) + if (!peer) { + ast_variables_destroy(var); return NULL; + } for (tmp = var; tmp; tmp = tmp->next) { /* Make sure it's not a user only... */ @@ -2470,11 +2472,12 @@ static struct iax2_peer *realtime_peer(const char *peername, struct sockaddr_in dynamic = 1; } } - if (!peer) - return NULL; ast_variables_destroy(var); + if (!peer) + return NULL; + if (ast_test_flag((&globalflags), IAX_RTCACHEFRIENDS)) { ast_copy_flags(peer, &globalflags, IAX_RTAUTOCLEAR|IAX_RTCACHEFRIENDS); if (ast_test_flag(peer, IAX_RTAUTOCLEAR)) { @@ -2533,11 +2536,12 @@ static struct iax2_user *realtime_user(const char *username) } user = build_user(username, var, NULL, !ast_test_flag((&globalflags), IAX_RTCACHEFRIENDS)); - if (!user) - return NULL; ast_variables_destroy(var); + if (!user) + return NULL; + if (ast_test_flag((&globalflags), IAX_RTCACHEFRIENDS)) { ast_set_flag(user, IAX_RTCACHEFRIENDS); AST_LIST_LOCK(&users); @@ -4739,16 +4743,14 @@ static int check_access(int callno, struct sockaddr_in *sin, struct iax_ies *ies *key = '\0'; key++; } - if (!key || ast_db_get(family, key, buf, sizeof(buf))) { + if (!key || ast_db_get(family, key, buf, sizeof(buf))) ast_log(LOG_WARNING, "Unable to retrieve database password for family/key '%s'!\n", user->dbsecret); - if (ast_test_flag(user, IAX_TEMPONLY)) { - destroy_user(user); - user = NULL; - } - } else + else ast_string_field_set(iaxs[callno], secret, buf); } else ast_string_field_set(iaxs[callno], secret, user->secret); + if (ast_test_flag(user, IAX_TEMPONLY)) + destroy_user(user); res = 0; } ast_set2_flag(iaxs[callno], iax2_getpeertrunk(*sin), IAX_TRUNK); |