[asterisk-commits] russell: branch group/sip-tcptls r99083 - in /team/group/sip-tcptls: ./ main/

[SVN commits to the Asterisk project]

Author: russell
Date: Fri Jan 18 15:40:54 2008
New Revision: 99083

URL: http://svn.digium.com/view/asterisk?view=rev&rev=99083
Log:
sync with trunk

Modified:
    team/group/sip-tcptls/   (props changed)
    team/group/sip-tcptls/main/frame.c

Propchange: team/group/sip-tcptls/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/group/sip-tcptls/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 18 15:40:54 2008
@@ -1,1 +1,1 @@
-/trunk:1-99038
+/trunk:1-99082

Modified: team/group/sip-tcptls/main/frame.c
URL: http://svn.digium.com/view/asterisk/team/group/sip-tcptls/main/frame.c?view=diff&rev=99083&r1=99082&r2=99083
==============================================================================
--- team/group/sip-tcptls/main/frame.c (original)
+++ team/group/sip-tcptls/main/frame.c Fri Jan 18 15:40:54 2008
@@ -321,6 +321,9 @@
 
 void ast_frame_free(struct ast_frame *fr, int cache)
 {
+	if (ast_test_flag(fr, AST_FRFLAG_FROM_TRANSLATOR))
+		ast_translate_frame_freed(fr);
+
 	if (!fr->mallocd)
 		return;
 
@@ -356,9 +359,6 @@
 #endif			
 		ast_free(fr);
 	}
-
-	if (ast_test_flag(fr, AST_FRFLAG_FROM_TRANSLATOR))
-		ast_translate_frame_freed(fr);
 }
 
 /*!