[asterisk-commits] dvossel: branch 1.6.1 r206870 - in /branches/1.6.1: ./ main/callerid.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Thu Jul 16 16:27:17 2009
New Revision: 206870

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

................
  r206868 | dvossel | 2009-07-16 16:25:22 -0500 (Thu, 16 Jul 2009) | 14 lines
  
  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:
    branches/1.6.1/   (props changed)
    branches/1.6.1/main/callerid.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/main/callerid.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/main/callerid.c?view=diff&rev=206870&r1=206869&r2=206870
==============================================================================
--- branches/1.6.1/main/callerid.c (original)
+++ branches/1.6.1/main/callerid.c Thu Jul 16 16:27:17 2009
@@ -1128,6 +1128,9 @@
 int ast_parse_caller_presentation(const char *data)
 {
 	int i;
+	if (!data) {
+		return -1;
+	}
 
 	for (i = 0; i < ARRAY_LEN(pres_types); i++) {
 		if (!strcasecmp(pres_types[i].name, data))