diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-05 23:08:55 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-05 23:08:55 +0000 |
| commit | 87aa4936dd9d504887da33f6fd31a28698deeaa0 (patch) | |
| tree | 5d281f677ecdf348e015fcea84494e8402a61555 /res | |
| parent | 555e7e7a5b9fb6bb1ae87678ee74a06af23088f9 (diff) | |
Merged revisions 7823 via svnmerge from
/branches/1.2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7824 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_features.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/res/res_features.c b/res/res_features.c index e058f2f43..b1747996e 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -944,13 +944,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; @@ -1583,7 +1585,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" |