aboutsummaryrefslogtreecommitdiffstats
path: root/channels/chan_misdn.c
diff options
context:
space:
mode:
authorcrichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-11 17:05:48 +0000
committercrichter <crichter@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-11 17:05:48 +0000
commita761fc492104fd2d5308135a7309ecaa4ebbc88c (patch)
tree41e9d4aa6a9525a40733658d0fc5aae888452b8f /channels/chan_misdn.c
parent731988c9fa14d9c03ffb2bbb57aa09e1b144c367 (diff)
Merged revisions 68733 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r68733 | crichter | 2007-06-11 18:57:59 +0200 (Mo, 11 Jun 2007) | 9 lines Merged revisions 68732 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r68732 | crichter | 2007-06-11 18:49:00 +0200 (Mo, 11 Jun 2007) | 1 line added check for NULL Pointer when calling misdn_new. Asterisk does not allow us to create channels anymore when stop gracefully is used :). also modified the restart_indicator to 0 ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@68740 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_misdn.c')
-rw-r--r--channels/chan_misdn.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index d47eb3ce0..450ee6cc3 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -3057,7 +3057,12 @@ static struct ast_channel *misdn_request(const char *type, int format, void *dat
cl->bc = newbc;
tmp = misdn_new(cl, AST_STATE_RESERVED, ext, NULL, format, port, channel);
- cl->ast = tmp;
+ if (!tmp) {
+ ast_log(LOG_ERROR,"Could not create Asterisk object\n");
+ return NULL;
+ }
+
+ cl->ast=tmp;
/* register chan in local list */
cl_queue_chan(&cl_te, cl) ;
@@ -3959,6 +3964,13 @@ cb_events(enum event_e event, struct misdn_bchannel *bc, void *user_data)
ch->originator = ORG_MISDN;
chan = misdn_new(ch, AST_STATE_RESERVED, bc->dad, bc->oad, AST_FORMAT_ALAW, bc->port, bc->channel);
+
+ if (!chan) {
+ misdn_lib_send_event(bc,EVENT_RELEASE_COMPLETE);
+ ast_log(LOG_ERROR, "cb_events: misdn_new failed !\n");
+ return 0;
+ }
+
ch->ast = chan;
if ((exceed = add_in_calls(bc->port))) {