[asterisk-commits] dvossel: branch 1.6.2 r265364 - in /branches/1.6.2: ./ main/channel.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Mon May 24 14:30:45 2010
New Revision: 265364

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=265364
Log:
Merged revisions 265273 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r265273 | dvossel | 2010-05-24 11:10:09 -0500 (Mon, 24 May 2010) | 2 lines
  
  fixes segfault when using generic plc
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/channel.c

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

Modified: branches/1.6.2/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/channel.c?view=diff&rev=265364&r1=265363&r2=265364
==============================================================================
--- branches/1.6.2/main/channel.c (original)
+++ branches/1.6.2/main/channel.c Mon May 24 14:30:45 2010
@@ -3502,6 +3502,12 @@
 	int num_new_samples = frame->samples;
 	struct plc_ds *plc = datastore->data;
 
+
+	/* If this audio frame has no samples to fill in ignore it */
+	if (!num_new_samples) {
+		return;
+	}
+
 	/* First, we need to be sure that our buffer is large enough to accomodate
 	 * the samples we need to fill in. This will likely only occur on the first
 	 * frame we write.