ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winhttp: Raw request headers need to be terminated with double \r\n.

This commit is contained in:
Michael Müller 2015-08-18 07:56:39 +02:00 committed by Alexandre Julliard
parent 99dfc15e72
commit d2890778f9
2 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/winhttp/request.c
View File

@ -672,11 +672,8 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID
if (!(p = headers)) return FALSE; if (!(p = headers)) return FALSE;
for (len = 0; *p; p++) if (*p != '\r') len++; for (len = 0; *p; p++) if (*p != '\r') len++;
if (!buffer || (len + 1) * sizeof(WCHAR) > *buflen) if (!buffer || len * sizeof(WCHAR) > *buflen)
{
len++;
set_last_error( ERROR_INSUFFICIENT_BUFFER ); set_last_error( ERROR_INSUFFICIENT_BUFFER );
}
else else
{ {
for (p = headers, q = buffer; *p; p++, q++) for (p = headers, q = buffer; *p; p++, q++)
@ -688,8 +685,8 @@ static BOOL query_headers( request_t *request, DWORD level, LPCWSTR name, LPVOID
p++; /* skip '\n' */ p++; /* skip '\n' */
} }
} }
*q = 0;
TRACE("returning data: %s\n", debugstr_wn(buffer, len)); TRACE("returning data: %s\n", debugstr_wn(buffer, len));
if (len) len--;
ret = TRUE; ret = TRUE;
} }
*buflen = len * sizeof(WCHAR); *buflen = len * sizeof(WCHAR);
@ -2155,7 +2152,7 @@ static BOOL read_reply( request_t *request )
buflen = MAX_REPLY_LEN; buflen = MAX_REPLY_LEN;
if (!read_line( request, buffer, &buflen )) return TRUE; if (!read_line( request, buffer, &buflen )) return TRUE;
if (!*buffer) break; if (!*buffer) buflen = 1;
while (len - offset < buflen + crlf_len) while (len - offset < buflen + crlf_len)
{ {
@ -2164,6 +2161,11 @@ static BOOL read_reply( request_t *request )
if (!(tmp = heap_realloc( raw_headers, len * sizeof(WCHAR) ))) return FALSE; if (!(tmp = heap_realloc( raw_headers, len * sizeof(WCHAR) ))) return FALSE;
request->raw_headers = raw_headers = tmp; request->raw_headers = raw_headers = tmp;
} }
if (!*buffer)
{
memcpy( raw_headers + offset, crlf, sizeof(crlf) );
break;
}
MultiByteToWideChar( CP_ACP, 0, buffer, buflen, raw_headers + offset, buflen ); MultiByteToWideChar( CP_ACP, 0, buffer, buflen, raw_headers + offset, buflen );
if (!(header = parse_header( raw_headers + offset ))) break; if (!(header = parse_header( raw_headers + offset ))) break;

18
dlls/winhttp/tests/winhttp.c
View File

@ -2126,8 +2126,11 @@ static DWORD CALLBACK server_thread(LPVOID param)
static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path) static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path)
{ {
static const WCHAR test_header_end_clrf[] = {'\r','\n','\r','\n',0};
static const WCHAR test_header_end_raw[] = {0,0};
HINTERNET ses, con, req; HINTERNET ses, con, req;
char buffer[0x100]; char buffer[0x100];
WCHAR buffer2[0x100];
DWORD count, status, size, error, supported, first, target; DWORD count, status, size, error, supported, first, target;
BOOL ret; BOOL ret;
@ -2162,6 +2165,21 @@ static void test_basic_request(int port, const WCHAR *verb, const WCHAR *path)
ok(first == 0xdeadbeef, "got %x\n", first); ok(first == 0xdeadbeef, "got %x\n", first);
ok(target == 0xdeadbeef, "got %x\n", target); ok(target == 0xdeadbeef, "got %x\n", target);
size = sizeof(buffer2);
memset(buffer2, 0, sizeof(buffer2));
ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS_CRLF, NULL, buffer2, &size, NULL);
ok(ret, "failed to query for raw headers: %u\n", GetLastError());
ok(!memcmp(buffer2 + lstrlenW(buffer2) - 4, test_header_end_clrf, sizeof(test_header_end_clrf)),
"WinHttpQueryHeaders returned invalid end of header string\n");
size = sizeof(buffer2);
memset(buffer2, 0, sizeof(buffer2));
ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_RAW_HEADERS, NULL, buffer2, &size, NULL);
ok(ret, "failed to query for raw headers: %u\n", GetLastError());
ok(!memcmp(buffer2 + (size / sizeof(WCHAR)) - 1, test_header_end_raw, sizeof(test_header_end_raw)),
"WinHttpQueryHeaders returned invalid end of header string\n");
ok(buffer2[(size / sizeof(WCHAR)) - 2] != 0, "returned string has too many NULL characters\n");
count = 0; count = 0;
memset(buffer, 0, sizeof(buffer)); memset(buffer, 0, sizeof(buffer));
ret = WinHttpReadData(req, buffer, sizeof buffer, &count); ret = WinHttpReadData(req, buffer, sizeof buffer, &count);