[asterisk-commits] file: trunk r50267 - in /trunk: ./ main/pbx.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Tue Jan  9 21:53:30 2007
New Revision: 50267

URL: http://svn.digium.com/view/asterisk?view=rev&rev=50267
Log:
Merged revisions 50266 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r50266 | file | 2007-01-09 22:51:29 -0500 (Tue, 09 Jan 2007) | 2 lines

Ensure data's existence before trying to access it. (issue #8774 reported by rcourtna)

........

Modified:
    trunk/   (props changed)
    trunk/main/pbx.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/pbx.c
URL: http://svn.digium.com/view/asterisk/trunk/main/pbx.c?view=diff&rev=50267&r1=50266&r2=50267
==============================================================================
--- trunk/main/pbx.c (original)
+++ trunk/main/pbx.c Tue Jan  9 21:53:30 2007
@@ -1631,7 +1631,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;
 	}