[asterisk-commits] russell: trunk r96885 - in /trunk: ./ res/res_smdi.c

[SVN commits to the Asterisk project]

Author: russell
Date: Mon Jan  7 10:42:42 2008
New Revision: 96885

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

........
r96884 | russell | 2008-01-07 10:39:23 -0600 (Mon, 07 Jan 2008) | 3 lines

Don't crash if something happens when setting up an SMDI interface and it gets
destroyed before the SMDI port handling thread gets created.

........

Modified:
    trunk/   (props changed)
    trunk/res/res_smdi.c

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

Modified: trunk/res/res_smdi.c
URL: http://svn.digium.com/view/asterisk/trunk/res/res_smdi.c?view=diff&rev=96885&r1=96884&r2=96885
==============================================================================
--- trunk/res/res_smdi.c (original)
+++ trunk/res/res_smdi.c Mon Jan  7 10:42:42 2008
@@ -615,6 +615,8 @@
 
 			ast_copy_string(iface->name, v->value, sizeof(iface->name));
 
+			iface->thread = AST_PTHREADT_NULL;
+
 			if (!(iface->file = fopen(iface->name, "r"))) {
 				ast_log(LOG_ERROR, "Error opening SMDI interface %s (%s)\n", iface->name, strerror(errno));
 				ASTOBJ_UNREF(iface, ast_smdi_interface_destroy);