[asterisk-commits] russell: trunk r89888 - in /trunk: ./ main/autoservice.c

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Nov 27 17:50:58 2007
New Revision: 89888

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

........
r89886 | russell | 2007-11-27 17:47:28 -0600 (Tue, 27 Nov 2007) | 2 lines

Don't do frame processing if ast_read() returned NULL.

........

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

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

Modified: trunk/main/autoservice.c
URL: http://svn.digium.com/view/asterisk/trunk/main/autoservice.c?view=diff&rev=89888&r1=89887&r2=89888
==============================================================================
--- trunk/main/autoservice.c (original)
+++ trunk/main/autoservice.c Tue Nov 27 17:50:58 2007
@@ -80,6 +80,9 @@
 
 		if ((chan = ast_waitfor_n(mons, x, &ms))) {
 			struct ast_frame *f = ast_read(chan);
+	
+			if (!f)
+				continue;
 			
 			/* Do not add a default entry in this switch statement.  Each new
 			 * frame type should be addressed directly as to whether it should