[asterisk-commits] mmichelson: branch 1.6.0 r143610 - in /branches/1.6.0: ./ channels/chan_agent.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Fri Sep 19 10:48:37 2008
New Revision: 143610

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

........
r143609 | mmichelson | 2008-09-19 10:43:28 -0500 (Fri, 19 Sep 2008) | 11 lines

We should only unsubscribe to the device state event
subscription if we have previously subscribed. Otherwise
a segfault will occur.

(closes issue #13476)
Reported by: jonnt
Patches:
      13476.patch uploaded by putnopvut (license 60)
Tested by: jonnt


........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_agent.c

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

Modified: branches/1.6.0/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_agent.c?view=diff&rev=143610&r1=143609&r2=143610
==============================================================================
--- branches/1.6.0/channels/chan_agent.c (original)
+++ branches/1.6.0/channels/chan_agent.c Fri Sep 19 10:48:37 2008
@@ -2492,7 +2492,9 @@
 	/* First, take us out of the channel loop */
 	ast_channel_unregister(&agent_tech);
 	/* Delete devicestate subscription */
-	ast_event_unsubscribe(agent_devicestate_sub);
+	if (agent_devicestate_sub) {
+		agent_devicestate_sub = ast_event_unsubscribe(agent_devicestate_sub);
+	}
 	/* Unregister dialplan functions */
 	ast_custom_function_unregister(&agent_function);	
 	/* Unregister CLI commands */