Index: channels/chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.159
diff -u -r1.159 chan_zap.c
--- channels/chan_zap.c	19 Dec 2003 16:08:10 -0000	1.159
+++ channels/chan_zap.c	2 Jan 2004 22:31:23 -0000
@@ -3050,11 +3050,13 @@
 									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);
+									} 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);
@@ -3999,7 +4001,7 @@
 static void *ss_thread(void *data)
 {
 	struct ast_channel *chan = data;
-	struct zt_pvt *p = chan->pvt->pvt;
+	struct zt_pvt *p;
 	char exten[AST_MAX_EXTENSION]="";
 	char exten2[AST_MAX_EXTENSION]="";
 	unsigned char buf[256];
@@ -4015,6 +4017,12 @@
 	int len = 0;
 	int res;
 	int index;
+	if (chan)
+		p = chan->pvt->pvt;
+	else {
+		ast_log(LOG_ERROR, "ss_thread called with NULL!!\n");
+		return NULL;
+	}
 	if (option_verbose > 2) 
 		ast_verbose( VERBOSE_PREFIX_3 "Starting simple switch on '%s'\n", chan->name);
 	index = zt_get_index(chan, p, 1);
@@ -4675,12 +4683,14 @@
 		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);
+				} 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);