summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2007-10-22 14:58:57 +0000
committerMark Michelson <mmichelson@digium.com>2007-10-22 14:58:57 +0000
commit2d5c98be1e69d94067a0083e6ff8d9b212c4f176 (patch)
tree5102d890c5e1b67feb63ab655a2bc1fd8caca6cb
parent6a0ae0aca48b1860fb3bae887fedcf9d4461baf8 (diff)
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) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86696 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r--apps/app_voicemail.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 6fbb5b1db..525342ea5 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -9383,8 +9383,8 @@ static char *get_header_by_tag(char *header, char *tag, char *buf, size_t len)
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;
}