[Asterisk-cvs] asterisk pbx.c,1.203,1.204

[markster at lists.digium.com]

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

Modified Files:
	pbx.c 
Log Message:
Fix ${CALLINGSUBADDR}


Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -d -r1.203 -r1.204
--- pbx.c	13 Feb 2005 20:57:52 -0000	1.203
+++ pbx.c	17 Feb 2005 19:41:23 -0000	1.204
@@ -911,7 +911,8 @@
 					*ret = workspace;
 				} else
 					*ret = NULL;
-			}
+			} else
+				goto icky;
 		} else if (!strncmp(var + 4, "ING", 3)) {
 			if (!strcmp(var + 7, "PRES")) {
 				/* CALLINGPRES */
@@ -929,7 +930,8 @@
 				/* CALLINGTNS */
 				snprintf(workspace, workspacelen, "%d", c->cid.cid_tns);
 				*ret = workspace;
-			}
+			} else
+				goto icky;
 		} else
 			goto icky;
 	} else if (c && !strcmp(var, "DNID")) {