Merged revisions 7823 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Thu, 5 Jan 2006 23:08:55 +0000 (23:08 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Thu, 5 Jan 2006 23:08:55 +0000 (23:08 +0000)
/branches/1.2

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7824 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_features.c

index e058f2f..b174799 100644 (file)
@@ -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"