From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Mon, 19 Apr 2010 19:23:41 +0000 (+0000)
Subject: Bad merge fix
X-Git-Tag: 11.0.0-beta1~3157
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=990ccdd05f17eb845fdd255568d44eac3833bf14;p=thirdparty%2Fasterisk.git

Bad merge fix


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@257883 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index d38978b221..4f617e1c4c 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'))) {