From: Russell Bryant <russell@russellbryant.com>
Date: Sun, 11 Jun 2006 21:23:16 +0000 (+0000)
Subject: Merged revisions 33548 via svnmerge from
X-Git-Tag: 1.4.0-beta1~932
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9aac1c00350a0ffb72307223f038dcbde88b3ee2;p=thirdparty%2Fasterisk.git

Merged revisions 33548 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r33548 | russell | 2006-06-11 17:21:23 -0400 (Sun, 11 Jun 2006) | 2 lines

fix another place where a frame does not get free'd

........


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

diff --git a/pbx.c b/pbx.c
index b8beb0f6c6..620b7dc384 100644
--- a/pbx.c
+++ b/pbx.c
@@ -4452,8 +4452,10 @@ static void *async_wait(void *data)
 			break;
 		if (f->frametype == AST_FRAME_CONTROL) {
 			if ((f->subclass == AST_CONTROL_BUSY)  ||
-				(f->subclass == AST_CONTROL_CONGESTION) )
-					break;
+			    (f->subclass == AST_CONTROL_CONGESTION) ) {
+				ast_frfree(f);
+				break;
+			}
 		}
 		ast_frfree(f);
 	}