[asterisk-commits] rmudgett: trunk r264828 - in /trunk: ./ main/callerid.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu May 20 18:29:43 2010
New Revision: 264828

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=264828
Log:
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.
........

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://svnview.digium.com/svn/asterisk/trunk/main/callerid.c?view=diff&rev=264828&r1=264827&r2=264828
==============================================================================
--- trunk/main/callerid.c (original)
+++ trunk/main/callerid.c Thu May 20 18:29:43 2010
@@ -1008,6 +1008,8 @@
 				*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);