Jacek Caban : wininet: Store error state separately from end of stream in chunked stream.
Alexandre Julliard
julliard at winehq.org
Thu Aug 17 18:55:08 CDT 2017
Module: wine
Branch: master
Commit: 8090d169ab4bc3c3bee6adb5536d6cea350e00f5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8090d169ab4bc3c3bee6adb5536d6cea350e00f5
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Aug 17 19:09:37 2017 +0200
wininet: Store error state separately from end of stream in chunked stream.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wininet/http.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 6a7b6db..40bf96a 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -401,7 +401,8 @@ typedef struct {
CHUNKED_STREAM_STATE_READING_CHUNK,
CHUNKED_STREAM_STATE_DISCARD_EOL_AFTER_DATA,
CHUNKED_STREAM_STATE_DISCARD_EOL_AT_END,
- CHUNKED_STREAM_STATE_END_OF_STREAM
+ CHUNKED_STREAM_STATE_END_OF_STREAM,
+ CHUNKED_STREAM_STATE_ERROR
} state;
} 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)
{
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,
@@ -2713,7 +2721,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf,
continue_read = FALSE;
continue;
}else {
- chunked_stream->state = CHUNKED_STREAM_STATE_END_OF_STREAM;
+ chunked_stream->state = CHUNKED_STREAM_STATE_ERROR;
}
break;
default:
@@ -2775,7 +2783,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf,
}
if(!read_bytes) {
- chunked_stream->state = CHUNKED_STREAM_STATE_END_OF_STREAM;
+ chunked_stream->state = CHUNKED_STREAM_STATE_ERROR;
continue;
}
}
@@ -2805,6 +2813,7 @@ static DWORD chunked_read(data_stream_t *stream, http_request_t *req, BYTE *buf,
break;
case CHUNKED_STREAM_STATE_END_OF_STREAM:
+ case CHUNKED_STREAM_STATE_ERROR:
continue_read = FALSE;
break;
}
@@ -2826,7 +2835,8 @@ static DWORD chunked_drain_content(data_stream_t *stream, http_request_t *req, B
BYTE buf[1024];
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);
if(res != ERROR_SUCCESS)
return res;
More information about the wine-cvs
mailing list