[Asterisk-cvs] asterisk/channels chan_vpb.c,1.57,1.58

bkramer at lists.digium.com bkramer at lists.digium.com
Mon Jan 10 16:05:05 CST 2005


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

Modified Files:
	chan_vpb.c 
Log Message:
/ checks to if owner is set before using it.


Index: chan_vpb.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_vpb.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- chan_vpb.c	9 Jan 2005 22:29:55 -0000	1.57
+++ chan_vpb.c	10 Jan 2005 22:09:19 -0000	1.58
@@ -979,13 +979,19 @@
 						p->callerid[p->dtmf_caller_pos] = '\0';
 						if (option_verbose > 2)
 							ast_verbose(VERBOSE_PREFIX_3 " %s: DTMF CallerID %s\n",p->dev,p->callerid);
-						if (owner->cid.cid_num)
-							free(owner->cid.cid_num);
-						owner->cid.cid_num=NULL;
-						if (owner->cid.cid_name)
-							free(owner->cid.cid_name);
-						owner->cid.cid_name=NULL;
-						owner->cid.cid_num = strdup(p->callerid);
+						if (owner){
+							if (owner->cid.cid_num)
+								free(owner->cid.cid_num);
+							owner->cid.cid_num=NULL;
+							if (owner->cid.cid_name)
+								free(owner->cid.cid_name);
+							owner->cid.cid_name=NULL;
+							owner->cid.cid_num = strdup(p->callerid);
+						}
+						else {
+							if (option_verbose > 2)
+								ast_verbose(VERBOSE_PREFIX_3 " %s: DTMF CallerID: no owner to assign CID \n",p->dev);
+						}
 					} else if ( p->dtmf_caller_pos < AST_MAX_EXTENSION ) {
 						if ( p->dtmf_caller_pos >= 0 )
 							p->callerid[p->dtmf_caller_pos] = e->data;




More information about the svn-commits mailing list