Bad merge fix
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 19 Apr 2010 19:23:41 +0000 (19:23 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 19 Apr 2010 19:23:41 +0000 (19:23 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@257883 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_voicemail.c

index d38978b..4f617e1 100644 (file)
@@ -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'))) {