kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-15 14:28:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "chan_sip.c: Stop handling continuation lines after reading headers" into 13

Browse Source
This commit is contained in:
Friendly Automation
2020-01-21 08:20:21 -06:00
committed by Gerrit Code Review
parent 537645d28c d514fa3300
commit f5128d610d
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
channels/chan_sip.c
View File

@@ -9833,8 +9833,10 @@ static void lws2sws(struct ast_str *data)
int len = ast_str_strlen(data); int len = ast_str_strlen(data);
int h = 0, t = 0; int h = 0, t = 0;
int lws = 0; int lws = 0;
int just_read_eol = 0;
int done_with_headers = 0;
for (; h < len;) { while (h < len) {
/* Eliminate all CRs */ /* Eliminate all CRs */
if (msgbuf[h] == '\r') { if (msgbuf[h] == '\r') {
h++; h++;
@@ -9842,11 +9844,17 @@ static void lws2sws(struct ast_str *data)
} }
/* Check for end-of-line */ /* Check for end-of-line */
if (msgbuf[h] == '\n') { if (msgbuf[h] == '\n') {
if (just_read_eol) {
done_with_headers = 1;
} else {
just_read_eol = 1;
}
/* Check for end-of-message */ /* Check for end-of-message */
if (h + 1 == len) if (h + 1 == len)
break; break;
/* Check for a continuation line */ /* Check for a continuation line */
if (msgbuf[h + 1] == ' ' || msgbuf[h + 1] == '\t') { if (!done_with_headers
&& (msgbuf[h + 1] == ' ' || msgbuf[h + 1] == '\t')) {
/* Merge continuation line */ /* Merge continuation line */
h++; h++;
continue; continue;
@@ -9855,8 +9863,11 @@ static void lws2sws(struct ast_str *data)
msgbuf[t++] = msgbuf[h++]; msgbuf[t++] = msgbuf[h++];
lws = 0; lws = 0;
continue; continue;
} else {
just_read_eol = 0;
} }
if (msgbuf[h] == ' ' || msgbuf[h] == '\t') { if (!done_with_headers
&& (msgbuf[h] == ' ' || msgbuf[h] == '\t')) {
if (lws) { if (lws) {
h++; h++;
continue; continue;