[svn-commits] mjordan: trunk r427586 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: mjordan
Date: Sat Nov  8 18:14:56 2014
New Revision: 427586

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=427586
Log:
app_voicemail: Fix enhancement that allowed multiple recipients in To: header

An issue existed in r420577, which added multiple recipients to voicemail
emails. The patch, when looking at the intended recipients, looked ahead for
the '|' character inside a while loop which already had pulled out the
appropriate field parsing on the '|' character. This would cause it to skip
the recipients.

This patch fixes it such that it relies completely on the while loop to parse
through the e-mail fields.

Note that the original author of the patch looked at this fix and approved it.

ASTERISK-24250 #close
Reported by: abelbeck
patches:
  voicemail-420577-to-comma-fix.diff uploaded by abelbeck (License 5903)
........

Merged revisions 427585 from http://svn.asterisk.org/svn/asterisk/branches/13

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

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

Modified: trunk/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=427586&r1=427585&r2=427586
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Sat Nov  8 18:14:56 2014
@@ -5063,7 +5063,7 @@
 	fprintf(p, "To:");
 	first_line = 1;
 	while ((email = strsep(&emailsbuf, "|"))) {
-		char *next = strchr(S_OR(emailsbuf, ""), '|');
+		char *next = emailsbuf;
 		if (check_mime(vmu->fullname)) {
 			char *ptr;
 			ast_str_encode_mime(&str2, 0, vmu->fullname, first_line ? strlen("To: ") : 0, strlen(email) + 3 + (next ? strlen(",") : 0));