[asterisk-commits] trunk r33549 - in /trunk: ./ pbx.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Sun Jun 11 16:23:16 2006
New Revision: 33549

URL: http://svn.digium.com/view/asterisk?rev=33549&view=rev
Log:
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

........

Modified:
    trunk/   (props changed)
    trunk/pbx.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/pbx.c?rev=33549&r1=33548&r2=33549&view=diff
==============================================================================
--- trunk/pbx.c (original)
+++ trunk/pbx.c Sun Jun 11 16:23:16 2006
@@ -4452,8 +4452,10 @@
 			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);
 	}