From 0e1abeca6b2e62a306199e3c97dbfd36c954ee1c Mon Sep 17 00:00:00 2001
From: rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b>
Date: Thu, 20 May 2010 23:29:43 +0000
Subject: 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: http://svn.digium.com/svn/asterisk/trunk@264828 f38db490-d61c-443f-a65b-d21fe96a405b
---
 main/callerid.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'main/callerid.c')

diff --git a/main/callerid.c b/main/callerid.c
index be82e2b0d..17d265ed1 100644
--- a/main/callerid.c
+++ b/main/callerid.c
@@ -1008,6 +1008,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);
-- 
cgit v1.2.3