[asterisk-commits] mmichelson: branch 1.6.0 r202612 - in /branches/1.6.0: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Jun 23 10:25:03 2009
New Revision: 202612

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=202612
Log:
Merged revisions 202603 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r202603 | mmichelson | 2009-06-23 10:23:00 -0500 (Tue, 23 Jun 2009) | 8 lines
  
  Blocked revisions 202601 via svnmerge
  
  ........
    r202601 | mmichelson | 2009-06-23 10:22:35 -0500 (Tue, 23 Jun 2009) | 3 lines
    
    Fix more memory leaks that may result if rtp is not successfully allocated.
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_sip.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=202612&r1=202611&r2=202612
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Tue Jun 23 10:25:03 2009
@@ -6103,11 +6103,15 @@
 			if (p->vrtp) {
 				ast_rtp_destroy(p->vrtp);
 			}
+			if (p->udptl) {
+				ast_udptl_destroy(p->udptl);
+			}
 			ast_mutex_destroy(&p->pvt_lock);
 			if (p->chanvars) {
 				ast_variables_destroy(p->chanvars);
 				p->chanvars = NULL;
 			}
+			ast_string_field_free_memory(p);
 			ast_free(p);
 			return NULL;
 		}