aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-19 19:23:41 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-04-19 19:23:41 +0000
commitd14c12effda8dc6399c57139b8228f62c03fc228 (patch)
tree78beef8974ef73a31629ad9f651a1440cd3a19f1 /apps
parent983bf3878ca216158554e2438ad3c58b02489e99 (diff)
Bad merge fix
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@257883 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps')
-rw-r--r--apps/app_voicemail.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index d38978b22..4f617e1c4 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -4483,7 +4483,7 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in
#ifdef IMAP_STORAGE
{
/* Convert body to native line terminators for IMAP backend */
- char *line = passdata, *next;
+ char *line = ast_str_buffer(str1), *next;
do {
/* Terminate line before outputting it to the file */
if ((next = strchr(line, '\n'))) {