diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2010-05-20 23:29:43 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2010-05-20 23:29:43 +0000 |
| commit | 43991ce806f1cb587d8893afe035519efd7977d4 (patch) | |
| tree | 226118afc353011a53f025782e1ab371bae78c8b /main/callerid.c | |
| parent | 815d7bfe445cf172baf8bd3935c4fa0f305275ab (diff) | |
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/trunk@264828 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/callerid.c')
| -rw-r--r-- | main/callerid.c | 2 |
1 files changed, 2 insertions, 0 deletions
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); |