[svn-commits] bbryant: trunk r318922 - in /trunk: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: bbryant
Date: Fri May 13 13:10:45 2011
New Revision: 318922

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=318922
Log:
Merged revisions 318921 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r318921 | bbryant | 2011-05-13 14:09:34 -0400 (Fri, 13 May 2011) | 8 lines
  
  Fixes a segmentation fault in dynamic hints when a channel technology isn't
  loaded for a hint.
  
  (closes issue #18495)
  Reported by: bertrand
  Tested by: bertrand
........

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

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

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=318922&r1=318921&r2=318922
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Fri May 13 13:10:45 2011
@@ -3882,7 +3882,7 @@
 			}
 			/* Clear the exception flag */
 			ast_clear_flag(chan, AST_FLAG_EXCEPTION);
-		} else if (chan->tech->read)
+		} else if (chan->tech && chan->tech->read)
 			f = chan->tech->read(chan);
 		else
 			ast_log(LOG_WARNING, "No read routine on channel %s\n", chan->name);