[asterisk-commits] dvossel: trunk r206868 - in /trunk: ./ main/callerid.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Jul 16 16:25:22 2009
New Revision: 206868

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

........
  r206867 | dvossel | 2009-07-16 16:24:16 -0500 (Thu, 16 Jul 2009) | 8 lines
  
  avoid segfault caused by user error
  
  If the CALLERPRES() dialplan function is set to nothing,
  a segfault occurs.  This is user error to begin with, but
  I'd rather see a cli warning message than have Asterisk
  crash on me.
........

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

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

Modified: trunk/main/callerid.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/main/callerid.c?view=diff&rev=206868&r1=206867&r2=206868
==============================================================================
--- trunk/main/callerid.c (original)
+++ trunk/main/callerid.c Thu Jul 16 16:25:22 2009
@@ -1124,6 +1124,9 @@
 int ast_parse_caller_presentation(const char *data)
 {
 	int index;
+	if (!data) {
+		return -1;
+	}
 
 	for (index = 0; index < ARRAY_LEN(pres_types); ++index) {
 		if (!strcasecmp(pres_types[index].name, data)) {