Merged revisions 264828 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r264828 | rmudgett | 2010-05-20 18:29:43 -0500 (Thu, 20 May 2010) | 13 lines
  
  Merged revisions 264820 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r264820 | rmudgett | 2010-05-20 18:23:21 -0500 (Thu, 20 May 2010) | 6 lines
    
    ast_callerid_parse() had a path that left name uninitialized.
    
    Several callers of ast_callerid_parse() do not initialize the name
    parameter before calling thus there is the potential to use an
    uninitialized pointer.
  ........
................


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

main/callerid.c

@@ -1022,6 +1022,8 @@ int ast_callerid_parse(char *instr, char **name, char **location)
 				*ns = '\0';
 				*name = ns + 1;
 				ast_trim_blanks(*name);
+			} else {
+				*name = NULL;
 			}
 		} else { /* no quotes, trim off leading and trailing spaces */
 			*name = ast_skip_blanks(instr);