[asterisk-commits] file: trunk r66438 - in /trunk: ./ main/rtp.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Tue May 29 11:46:49 2007
New Revision: 66438

URL: http://svn.digium.com/view/asterisk?view=rev&rev=66438
Log:
Merged revisions 66437 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r66437 | file | 2007-05-29 12:44:34 -0400 (Tue, 29 May 2007) | 2 lines

Handle cases where a frame may have no data. (issue #9519 reported by dmb)

........

Modified:
    trunk/   (props changed)
    trunk/main/rtp.c

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

Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?view=diff&rev=66438&r1=66437&r2=66438
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Tue May 29 11:46:49 2007
@@ -2862,7 +2862,7 @@
 			ast_smoother_feed(rtp->smoother, _f);
 		}
 
-		while ((f = ast_smoother_read(rtp->smoother)))
+		while ((f = ast_smoother_read(rtp->smoother)) && (f->data))
 			ast_rtp_raw_write(rtp, f, codec);
 	} else {
 	        /* Don't buffer outgoing frames; send them one-per-packet: */
@@ -2870,7 +2870,8 @@
 			f = ast_frdup(_f);	/*! \bug XXX this might never be free'd. Why do we do this? */
 		else
 			f = _f;
-		ast_rtp_raw_write(rtp, f, codec);
+		if (f->data)
+			ast_rtp_raw_write(rtp, f, codec);
 		if (f != _f)
 			ast_frfree(f);
 	}