[asterisk-commits] trunk - r7620 /trunk/apps/app_meetme.c

[asterisk-commits at lists.digium.com]

Author: markster
Date: Sat Dec 24 19:27:47 2005
New Revision: 7620

URL: http://svn.digium.com/view/asterisk?rev=7620&view=rev
Log:
Fix multiple free of a frame (bug #6058)

Modified:
    trunk/apps/app_meetme.c

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?rev=7620&r1=7619&r2=7620&view=diff
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Sat Dec 24 19:27:47 2005
@@ -2264,10 +2264,10 @@
 					ast_frfree(cnf->transframe[x]);
 					cnf->transframe[x] = NULL;
 				}
-				if (cnf->origframe)
-					ast_frfree(cnf->origframe);
-				cnf->origframe = f;
-			}
+			}
+			if (cnf->origframe)
+				ast_frfree(cnf->origframe);
+			cnf->origframe = f;
 			ast_mutex_unlock(&cnf->listenlock);
 			if (s)
 				res = ast_writestream(s, f);