[Asterisk-cvs] asterisk/channels chan_zap.c,1.109,1.110

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv18849/channels

Modified Files:
	chan_zap.c 
Log Message:
Callerid fix and warning cleanup (bug #367 & #356)


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- chan_zap.c	6 Oct 2003 05:09:42 -0000	1.109
+++ chan_zap.c	8 Oct 2003 21:57:43 -0000	1.110
@@ -4359,6 +4359,8 @@
 			} else
 				ast_log(LOG_WARNING, "Unable to get caller ID space\n");
 		}
+		else
+			cs = NULL;
 		if (name && number) {
 			snprintf(cid, sizeof(cid), "\"%s\" <%s>", name, number);
 		} else if (name) {
@@ -4368,6 +4370,8 @@
 		} else {
 			strcpy(cid, "");
 		}
+		if (cs)
+			callerid_free(cs);
 		if (strlen(cid)) {
 			chan->callerid = strdup(cid);
 			chan->ani = strdup(cid);