[asterisk-commits] russell: trunk r56849 - in /trunk: ./ channels/chan_iax2.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Mon Feb 26 14:04:53 2007
New Revision: 56849

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

........
r56847 | russell | 2007-02-26 14:04:13 -0600 (Mon, 26 Feb 2007) | 2 lines

Fix a crash in my last change to iax2_indicate(). (issue #9150)

........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_iax2.c

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

Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=56849&r1=56848&r2=56849
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Mon Feb 26 14:04:53 2007
@@ -3323,14 +3323,14 @@
 static int iax2_indicate(struct ast_channel *c, int condition, const void *data, size_t datalen)
 {
 	unsigned short callno = PTR_TO_CALLNO(c->tech_pvt);
-	struct chan_iax2_pvt *pvt = c->tech_pvt;
+	struct chan_iax2_pvt *pvt;
 	int res = 0;
 
 	if (option_debug && iaxdebug)
 		ast_log(LOG_DEBUG, "Indicating condition %d\n", condition);
 
 	ast_mutex_lock(&iaxsl[callno]);
-
+	pvt = iaxs[callno];
 	if (!strcasecmp(pvt->mohinterpret, "passthrough")) {
 		res = send_command(pvt, AST_FRAME_CONTROL, condition, 0, data, datalen, -1);
 		ast_mutex_unlock(&iaxsl[callno]);