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

Merged revisions 201678 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r201678 | dvossel | 2009-06-18 11:37:42 -0500 (Thu, 18 Jun 2009) | 11 lines
  
  fixes some memory leaks and redundant conditions
  
  (closes issue #15269)
  Reported by: contactmayankjain
  Patches:
        patch.txt uploaded by contactmayankjain (license 740)
        memory_leak_stuff.trunk.diff uploaded by dvossel (license 671)
  Tested by: contactmayankjain, dvossel
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@201680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2009-06-18 16:51:54 +00:00
parent c6c5ca6454
commit 09b65fe917
15 changed files with 43 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/app_rpt.c
View File

@@ -3940,7 +3940,7 @@ struct rpt_tele *tlist;
struct rpt *myrpt;
struct rpt_link *l,*l1,linkbase;
struct ast_channel *mychannel;
int id_malloc, vmajor, vminor, m;
int vmajor, vminor, m;
char *p,*ct,*ct_copy,*ident, *nodename,*cp;
time_t t;
#ifdef NEW_ASTERISK
@@ -3987,14 +3987,10 @@ struct dahdi_params par;
ast_free(mytele);
pthread_exit(NULL);
}
else{
id_malloc = 1;
}
}
else
{
ident = "";
id_malloc = 0;
}
rpt_mutex_unlock(&myrpt->lock);
@@ -4010,8 +4006,7 @@ struct dahdi_params par;
ast_log(LOG_NOTICE,"Telemetry thread aborted at line %d, mode: %d\n",__LINE__, mytele->mode); /*@@@@@@@@@@@*/
rpt_mutex_unlock(&myrpt->lock);
ast_free(nodename);
if(id_malloc)
ast_free(ident);
ast_free(ident);
ast_free(mytele);
pthread_exit(NULL);
}
@@ -4057,8 +4052,7 @@ struct dahdi_params par;
rpt_mutex_unlock(&myrpt->lock);
ast_log(LOG_NOTICE,"Telemetry thread aborted at line %d, mode: %d\n",__LINE__, mytele->mode); /*@@@@@@@@@@@*/
ast_free(nodename);
if(id_malloc)
ast_free(ident);
ast_free(ident);
ast_free(mytele);
ast_hangup(mychannel);
pthread_exit(NULL);
@@ -4252,8 +4246,7 @@ struct dahdi_params par;
rpt_mutex_unlock(&myrpt->lock);
ast_log(LOG_NOTICE,"Telemetry thread aborted at line %d, mode: %d\n",__LINE__, mytele->mode); /*@@@@@@@@@@@*/
ast_free(nodename);
if(id_malloc)
ast_free(ident);
ast_free(ident);
ast_free(mytele);
ast_hangup(mychannel);
pthread_exit(NULL);
@@ -4293,8 +4286,7 @@ struct dahdi_params par;
rpt_mutex_unlock(&myrpt->lock);
ast_log(LOG_NOTICE,"Telemetry thread aborted at line %d, mode: %d\n",__LINE__, mytele->mode); /*@@@@@@@@@@@*/
ast_free(nodename);
if(id_malloc)
ast_free(ident);
ast_free(ident);
ast_free(mytele);
ast_hangup(mychannel);
pthread_exit(NULL);
@@ -4816,8 +4808,7 @@ struct dahdi_params par;
rpt_mutex_unlock(&myrpt->lock);
ast_log(LOG_NOTICE,"Telemetry thread aborted at line %d, mode: %d\n",__LINE__, mytele->mode); /*@@@@@@@@@@@*/
ast_free(nodename);
if(id_malloc)
ast_free(ident);
ast_free(ident);
ast_free(mytele);
ast_hangup(mychannel);
pthread_exit(NULL);
@@ -5193,8 +5184,7 @@ struct dahdi_params par;
myrpt->active_telem = NULL;
rpt_mutex_unlock(&myrpt->lock);
ast_free(nodename);
if(id_malloc)
ast_free(ident);
ast_free(ident);
ast_free(mytele);
ast_hangup(mychannel);
#ifdef APP_RPT_LOCK_DEBUG