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

wininet: Store error state separately from end of stream in chunked stream.

Browse Source 
Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2017-08-17 19:09:37 +02:00 committed by Alexandre Julliard
parent 752d078a42
commit 8090d169ab
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/wininet/http.c
View File

@ -401,7 +401,8 @@ typedef struct {
CHUNKED_STREAM_STATE_READING_CHUNK, CHUNKED_STREAM_STATE_READING_CHUNK,
CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_DATA, CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_DATA,
CHUNKED_STREAM_STATE_DISCARD_EOL_AT_END, CHUNKED_STREAM_STATE_DISCARD_EOL_AT_END,
CHUNKED_STREAM_STATE_END_OF_STREAM CHUNKED_STREAM_STATE_END_OF_STREAM,
CHUNKED_STREAM_STATE_ERROR
} state; } state;
} chunked_stream_t; } chunked_stream_t;
@ -2681,7 +2682,14 @@ static char next_chunked_data_char(chunked_stream_t *stream)
static BOOL chunked_end_of_data(data_stream_t *stream, http_request_t *req) static BOOL chunked_end_of_data(data_stream_t *stream, http_request_t *req)
{ {
chunked_stream_t *chunked_stream = (chunked_stream_t*)stream; chunked_stream_t *chunked_stream = (chunked_stream_t*)stream;
return chunked_stream->state == CHUNKED_STREAM_STATE_END_OF_STREAM; switch(chunked_stream->state) {
case CHUNKED_STREAM_STATE_DISCARD_EOL_AT_END:
case CHUNKED_STREAM_STATE_END_OF_STREAM:
case CHUNKED_STREAM_STATE_ERROR:
return TRUE;
default:
return FALSE;
}
} }
static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DWORD size, static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf, DWORD size,
@ -2713,7 +2721,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf,
continue_read = FALSE; continue_read = FALSE;
continue; continue;
}else { }else {
chunked_stream->state = CHUNKED_STREAM_STATE_END_OF_STREAM; chunked_stream->state = CHUNKED_STREAM_STATE_ERROR;
} }
break; break;
default: default:
@ -2775,7 +2783,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf,
} }
if(!read_bytes) { if(!read_bytes) {
chunked_stream->state = CHUNKED_STREAM_STATE_END_OF_STREAM; chunked_stream->state = CHUNKED_STREAM_STATE_ERROR;
continue; continue;
} }
} }
@ -2805,6 +2813,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf,
break; break;
case CHUNKED_STREAM_STATE_END_OF_STREAM: case CHUNKED_STREAM_STATE_END_OF_STREAM:
case CHUNKED_STREAM_STATE_ERROR:
continue_read = FALSE; continue_read = FALSE;
break; break;
} }
@ -2826,7 +2835,8 @@ static DWORD chunked_drain_content(data_stream_t *stream, http_request_t *req, B
BYTE buf[1024]; BYTE buf[1024];
DWORD size, res; DWORD size, res;
while(chunked_stream->state != CHUNKED_STREAM_STATE_END_OF_STREAM) { while(chunked_stream->state != CHUNKED_STREAM_STATE_END_OF_STREAM
&& chunked_stream->state != CHUNKED_STREAM_STATE_ERROR) {
res = chunked_read(stream, req, buf, sizeof(buf), &size, allow_blocking); res = chunked_read(stream, req, buf, sizeof(buf), &size, allow_blocking);
if(res != ERROR_SUCCESS) if(res != ERROR_SUCCESS)
return res; return res;