[asterisk-commits] tilghman: trunk r257883 - /trunk/apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Mon Apr 19 14:23:41 2010
New Revision: 257883

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=257883
Log:
Bad merge fix

Modified:
    trunk/apps/app_voicemail.c

Modified: trunk/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=257883&r1=257882&r2=257883
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Mon Apr 19 14:23:41 2010
@@ -4483,7 +4483,7 @@
 #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'))) {