[asterisk-commits] rmudgett: branch 1.6.2 r264829 - in /branches/1.6.2: ./ main/callerid.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu May 20 18:34:33 2010
New Revision: 264829

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

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/main/callerid.c

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

Modified: branches/1.6.2/main/callerid.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/main/callerid.c?view=diff&rev=264829&r1=264828&r2=264829
==============================================================================
--- branches/1.6.2/main/callerid.c (original)
+++ branches/1.6.2/main/callerid.c Thu May 20 18:34:33 2010
@@ -1022,6 +1022,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);