diff options
| author | MaxXor <admin@maxxor.org> | 2017-09-01 09:38:31 +0200 |
|---|---|---|
| committer | MaxXor <admin@maxxor.org> | 2017-09-01 09:38:31 +0200 |
| commit | c65062ad5e4e6cbf2d566998c5b90c170d12b233 (patch) | |
| tree | 517157f9e20227dba6af7d873a5ac4cda157ca24 /external/miniupnpc | |
| parent | Merge pull request #2343 (diff) | |
| download | monero-c65062ad5e4e6cbf2d566998c5b90c170d12b233.tar.xz | |
Fix miniupnpc CVE-2017-8798
Diffstat (limited to 'external/miniupnpc')
| -rw-r--r-- | external/miniupnpc/miniwget.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/external/miniupnpc/miniwget.c b/external/miniupnpc/miniwget.c index ca88a1e9d..9978bf313 100644 --- a/external/miniupnpc/miniwget.c +++ b/external/miniupnpc/miniwget.c @@ -280,11 +280,12 @@ getHTTPResponse(int s, int * size, int * status_code) goto end_of_stream; } } - bytestocopy = ((int)chunksize < (n - i))?chunksize:(unsigned int)(n - i); + /* it is guaranteed that (n >= i) */ + bytestocopy = (chunksize < (unsigned int)(n - i))?chunksize:(unsigned int)(n - i); if((content_buf_used + bytestocopy) > content_buf_len) { char * tmp; - if(content_length >= (int)(content_buf_used + bytestocopy)) { + if((content_length >= 0) && ((unsigned int)content_length >= (content_buf_used + bytestocopy))) { content_buf_len = content_length; } else { content_buf_len = content_buf_used + bytestocopy; @@ -309,14 +310,15 @@ getHTTPResponse(int s, int * size, int * status_code) { /* not chunked */ if(content_length > 0 - && (int)(content_buf_used + n) > content_length) { + && (content_buf_used + n) > (unsigned int)content_length) { /* skipping additional bytes */ n = content_length - content_buf_used; } if(content_buf_used + n > content_buf_len) { char * tmp; - if(content_length >= (int)(content_buf_used + n)) { + if(content_length >= 0 + && (unsigned int)content_length >= (content_buf_used + n)) { content_buf_len = content_length; } else { content_buf_len = content_buf_used + n; @@ -336,7 +338,7 @@ getHTTPResponse(int s, int * size, int * status_code) } } /* use the Content-Length header value if available */ - if(content_length > 0 && (int)content_buf_used >= content_length) + if(content_length > 0 && content_buf_used >= (unsigned int)content_length) { #ifdef DEBUG printf("End of HTTP content\n"); |