[asterisk-commits] file: branch 1.4 r50266 - /branches/1.4/main/pbx.c

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Tue Jan 9 20:51:30 MST 2007


Author: file
Date: Tue Jan  9 21:51:29 2007
New Revision: 50266

URL: http://svn.digium.com/view/asterisk?view=rev&rev=50266
Log:
Ensure data's existence before trying to access it. (issue #8774 reported by rcourtna)

Modified:
    branches/1.4/main/pbx.c

Modified: branches/1.4/main/pbx.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/pbx.c?view=diff&rev=50266&r1=50265&r2=50266
==============================================================================
--- branches/1.4/main/pbx.c (original)
+++ branches/1.4/main/pbx.c Tue Jan  9 21:51:29 2007
@@ -1709,7 +1709,7 @@
 	memset(passdata, 0, datalen);
 
 	/* No variables or expressions in e->data, so why scan it? */
-	if (!strchr(e->data, '$') && !strstr(e->data,"${") && !strstr(e->data,"$[") && !strstr(e->data,"$(")) {
+	if (e->data && !strchr(e->data, '$') && !strstr(e->data,"${") && !strstr(e->data,"$[") && !strstr(e->data,"$(")) {
 		ast_copy_string(passdata, e->data, datalen);
 		return;
 	}



More information about the asterisk-commits mailing list