aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authordvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-06-18 16:44:37 +0000
committerdvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b>2009-06-18 16:44:37 +0000
commita5c4fc7c5c66f3eb7033dfe9bab13f372f420312 (patch)
tree36359604e36f0bd18032315b264af7e41120ebaa /apps
parente7fcf24d333393e808291fd319785a064de51b72 (diff)
Merged revisions 201678 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@201679 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_rpt.c24
1 files changed, 7 insertions, 17 deletions
diff --git a/apps/app_rpt.c b/apps/app_rpt.c
index c62ab9924..0b178b471 100644
--- a/apps/app_rpt.c
+++ b/apps/app_rpt.c
@@ -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