diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-08 00:01:30 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-08 00:01:30 +0000 |
| commit | fd2af649d29c51977d5efe592508857b720c5850 (patch) | |
| tree | 8b8f71f619c855ee4b9ad678c49f0176cf86f2c9 /apps/app_voicemail.c | |
| parent | 0657508a050338ac535fcd42a1c9d381c3b7fcb5 (diff) | |
Check for non-NULL before stripping characters.
(closes issue #12954)
Reported by: bfsworks
Patches:
20080701__bug12954.diff.txt uploaded by Corydon76 (license 14)
Tested by: deti
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@128856 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_voicemail.c')
| -rw-r--r-- | apps/app_voicemail.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 2bf8bfd60..b60390ce7 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -1847,7 +1847,7 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in char fname[256]; char dur[256]; char tmpcmd[256]; - char enc_cidnum[256], enc_cidname[256]; + char enc_cidnum[256] = "", enc_cidname[256] = ""; struct tm tm; char *passdata2; size_t len_passdata; @@ -1857,8 +1857,12 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in #define ENDL "\n" #endif - strip_control(cidnum, enc_cidnum, sizeof(enc_cidnum)); - strip_control(cidname, enc_cidname, sizeof(enc_cidname)); + if (cidnum) { + strip_control(cidnum, enc_cidnum, sizeof(enc_cidnum)); + } + if (cidname) { + strip_control(cidname, enc_cidname, sizeof(enc_cidname)); + } gethostname(host, sizeof(host) - 1); if (strchr(srcemail, '@')) ast_copy_string(who, srcemail, sizeof(who)); |