[asterisk-commits] mmichelson: trunk r86696 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Oct 22 09:58:57 2007
New Revision: 86696

URL: http://svn.digium.com/view/asterisk?view=rev&rev=86696
Log:
Merged revisions 86694 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r86694 | mmichelson | 2007-10-22 09:48:46 -0500 (Mon, 22 Oct 2007) | 5 lines

Account for the fact that sometimes headers may be terminated with \r\n instead of just \n

(closes issue #11043, reported by yehavi)


........

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=86696&r1=86695&r2=86696
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Mon Oct 22 09:58:57 2007
@@ -9383,8 +9383,8 @@
 	memset(buf, 0, len);
 
 	ast_copy_string(buf, start+taglen, len);
-	eol_pnt = strchr(buf,'\n');
-	*eol_pnt = '\0';
+	if ((eol_pnt = strchr(buf,'\r')) || (eol_pnt = strchr(buf,'\n')))
+		*eol_pnt = '\0';
 	return buf;
 }