diff options
| author | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-20 23:34:33 +0000 |
|---|---|---|
| committer | rmudgett <rmudgett@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-20 23:34:33 +0000 |
| commit | a102e9e04feb5e173694b3dc8f6de60b11802068 (patch) | |
| tree | 801b365ada1171ffe8a577b8af3970828064883b /main | |
| parent | 6969d606e349902cf06840f51f9eb0be545d8b3c (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@264829 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -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 261553e44..63ccc228b 100644 --- a/main/callerid.c +++ b/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); |