[svn-commits] irroot: branch irroot/distrotech-customers-trunk r319424 - /team/irroot/distr...

[SVN commits to the Digium repositories]

Author: irroot
Date: Tue May 17 12:24:26 2011
New Revision: 319424

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=319424
Log:
More generic check for bad frame

Modified:
    team/irroot/distrotech-customers-trunk/res/res_fax_spandsp.c

Modified: team/irroot/distrotech-customers-trunk/res/res_fax_spandsp.c
URL: http://svnview.digium.com/svn/asterisk/team/irroot/distrotech-customers-trunk/res/res_fax_spandsp.c?view=diff&rev=319424&r1=319423&r2=319424
==============================================================================
--- team/irroot/distrotech-customers-trunk/res/res_fax_spandsp.c (original)
+++ team/irroot/distrotech-customers-trunk/res/res_fax_spandsp.c Tue May 17 12:24:26 2011
@@ -716,11 +716,16 @@
 {
 	struct spandsp_pvt *p = s->tech_pvt;
 
+	/*invalid frame*/
+	if (!f->data.ptr || !f->samples) {
+		return 0;
+	}
+
 	/* Process a IFP packet */
-	if (f->data.ptr && (f->frametype == AST_FRAME_MODEM) && (f->subclass.integer == AST_MODEM_T38)) {
+	if ((f->frametype == AST_FRAME_MODEM) && (f->subclass.integer == AST_MODEM_T38)) {
 		t38_core_rx_ifp_packet(p->t38_core_state, f->data.ptr, f->datalen, f->seqno);
 		return 1;
-	} else if (f->data.ptr && (f->frametype == AST_FRAME_VOICE) && (f->subclass.format.id == AST_FORMAT_SLINEAR)) {
+	} else if ((f->frametype == AST_FRAME_VOICE) && (f->subclass.format.id == AST_FORMAT_SLINEAR)) {
 		t38_gateway_rx(&p->t38_gw_state, f->data.ptr, f->samples);
 		return 1;
 	}