aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-07 16:42:42 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-01-07 16:42:42 +0000
commit621f017866da8c3d561bbabb85d2d968f21479ea (patch)
tree9799b698b32a3f184392bb6cfad22b0ca1903f98 /res
parente2b34a1cc682cc0214aee6b38bf81f7cea33dfa1 (diff)
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. ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@96885 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_smdi.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/res/res_smdi.c b/res/res_smdi.c
index af20fbefd..1df720e83 100644
--- a/res/res_smdi.c
+++ b/res/res_smdi.c
@@ -615,6 +615,8 @@ static int smdi_load(int reload)
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);