Bug #736: Better checking to avoid chan_zap segfault re: ss_thread and zt_new()
authorMalcolm Davenport <malcolmd@digium.com>
Fri, 9 Jan 2004 05:13:50 +0000 (05:13 +0000)
committerMalcolm Davenport <malcolmd@digium.com>
Fri, 9 Jan 2004 05:13:50 +0000 (05:13 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1907 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_zap.c

index fc64911..24c2bdd 100755 (executable)
@@ -3050,11 +3050,13 @@ static struct ast_frame *zt_handle_event(struct ast_channel *ast)
                                                                        if (res)
                                                                                ast_log(LOG_WARNING, "Unable to start dial recall tone on channel %d\n", p->channel);
                                                                        p->owner = chan;
                                                                        if (res)
                                                                                ast_log(LOG_WARNING, "Unable to start dial recall tone on channel %d\n", p->channel);
                                                                        p->owner = chan;
-                                                                       if (pthread_create(&threadid, &attr, ss_thread, chan)) {
+                                                                       if (chan && pthread_create(&threadid, &attr, ss_thread, chan)) {
                                                                                ast_log(LOG_WARNING, "Unable to start simple switch on channel %d\n", p->channel);
                                                                                res = tone_zone_play_tone(p->subs[SUB_REAL].zfd, ZT_TONE_CONGESTION);
                                                                                zt_enable_ec(p);
                                                                                ast_hangup(chan);
                                                                                ast_log(LOG_WARNING, "Unable to start simple switch on channel %d\n", p->channel);
                                                                                res = tone_zone_play_tone(p->subs[SUB_REAL].zfd, ZT_TONE_CONGESTION);
                                                                                zt_enable_ec(p);
                                                                                ast_hangup(chan);
+                                                                       } else if (!chan) {
+                                                                               ast_log(LOG_WARNING, "Cannot allocate new structure on channel %d\n", p->channel);
                                                                        } else {
                                                                                if (option_verbose > 2) 
                                                                                        ast_verbose(VERBOSE_PREFIX_3 "Started three way call on channel %d\n", p->channel);
                                                                        } else {
                                                                                if (option_verbose > 2) 
                                                                                        ast_verbose(VERBOSE_PREFIX_3 "Started three way call on channel %d\n", p->channel);
@@ -4675,12 +4677,14 @@ static int handle_init_event(struct zt_pvt *i, int event)
                case SIG_SF:
                                /* Check for callerid, digits, etc */
                                chan = zt_new(i, AST_STATE_RING, 0, SUB_REAL, 0, 0);
                case SIG_SF:
                                /* Check for callerid, digits, etc */
                                chan = zt_new(i, AST_STATE_RING, 0, SUB_REAL, 0, 0);
-                               if (pthread_create(&threadid, &attr, ss_thread, chan)) {
+                               if (chan && pthread_create(&threadid, &attr, ss_thread, chan)) {
                                        ast_log(LOG_WARNING, "Unable to start simple switch thread on channel %d\n", i->channel);
                                        res = tone_zone_play_tone(i->subs[SUB_REAL].zfd, ZT_TONE_CONGESTION);
                                        if (res < 0)
                                                ast_log(LOG_WARNING, "Unable to play congestion tone on channel %d\n", i->channel);
                                        ast_hangup(chan);
                                        ast_log(LOG_WARNING, "Unable to start simple switch thread on channel %d\n", i->channel);
                                        res = tone_zone_play_tone(i->subs[SUB_REAL].zfd, ZT_TONE_CONGESTION);
                                        if (res < 0)
                                                ast_log(LOG_WARNING, "Unable to play congestion tone on channel %d\n", i->channel);
                                        ast_hangup(chan);
+                               } else if (!chan) {
+                                       ast_log(LOG_WARNING, "Cannot allocate new structure on channel %d\n", i->channel);
                                }
 #if 0
                                printf("Created thread %ld detached in switch(2)\n", threadid);
                                }
 #if 0
                                printf("Created thread %ld detached in switch(2)\n", threadid);