aboutsummaryrefslogtreecommitdiffstats
path: root/res/res_features.c
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2006-01-05 23:07:08 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2006-01-05 23:07:08 +0000
commite1820a3f10f990efbdfaa68a997c20785dac6f4b (patch)
treed1c80560ddfc3319c4518cad5207224468977462 /res/res_features.c
parentc51c2f425c96725791ead48455089ed582a229d4 (diff)
Bug 6081 - fix for memory leak, formatting fixes
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@7823 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_features.c')
-rw-r--r--res/res_features.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/res/res_features.c b/res/res_features.c
index f4ceba90a..6e4a0ac2c 100644
--- a/res/res_features.c
+++ b/res/res_features.c
@@ -940,13 +940,15 @@ static int feature_exec_app(struct ast_channel *chan, struct ast_channel *peer,
app = pbx_findapp(feature->app);
if (app) {
- struct ast_channel *work=chan;
- if (ast_test_flag(feature,AST_FEATURE_FLAG_CALLEE)) work=peer;
+ struct ast_channel *work = chan;
+ if (ast_test_flag(feature, AST_FEATURE_FLAG_CALLEE))
+ work = peer;
res = pbx_exec(work, app, feature->app_args, 1);
- if (res<0) return res;
+ if (res < 0)
+ return res;
} else {
ast_log(LOG_WARNING, "Could not find application (%s)\n", feature->app);
- res = -2;
+ return -2;
}
return FEATURE_RETURN_SUCCESS;
@@ -1572,7 +1574,8 @@ static void *do_parking_thread(void *ignore)
/* See if they need servicing */
f = ast_read(pu->chan);
if (!f || ((f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_HANGUP))) {
-
+ if (f)
+ ast_frfree(f);
manager_event(EVENT_FLAG_CALL, "ParkedCallGiveUp",
"Exten: %d\r\n"
"Channel: %s\r\n"