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.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@206868 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/callerid.c b/main/callerid.c
index 57119958a2c4e215eb789fd0b71a2ae5f468b0c8..0f2110c3fd526da7d5708b12467319be900417e7 100644 (file)
--- a/main/callerid.c
+++ b/main/callerid.c
@@ -1124,6 +1124,9 @@ static const struct ast_value_translation pres_types[] = {
 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)) {