]>
Commit | Line | Data |
---|---|---|
fb98beff ER |
1 | diff -up php-5.2.17/ext/zip/zip_stream.c.bug-49072 php-5.2.17/ext/zip/zip_stream.c |
2 | --- php-5.2.17/ext/zip/zip_stream.c.bug-49072 2011-08-28 14:06:52.000000000 +0700 | |
3 | +++ php-5.2.17/ext/zip/zip_stream.c 2011-08-28 14:09:41.000000000 +0700 | |
4 | @@ -34,7 +34,7 @@ static size_t php_zip_ops_read(php_strea | |
5 | STREAM_DATA_FROM_STREAM(); | |
6 | ||
7 | if (self->za && self->zf) { | |
8 | - n = (size_t)zip_fread(self->zf, buf, (int)count); | |
9 | + n = zip_fread(self->zf, buf, count); | |
10 | if (n < 0) { | |
11 | int ze, se; | |
12 | zip_file_error_get(self->zf, &ze, &se); | |
13 | @@ -42,13 +42,13 @@ static size_t php_zip_ops_read(php_strea | |
14 | php_error_docref(NULL TSRMLS_CC, E_WARNING, "Zip stream error: %s", zip_file_strerror(self->zf)); | |
15 | return 0; | |
16 | } | |
17 | - if (n == 0 || n < count) { | |
18 | + if (n == 0 || n < (ssize_t)count) { | |
19 | stream->eof = 1; | |
20 | } else { | |
21 | self->cursor += n; | |
22 | } | |
23 | } | |
24 | - return n<1 ? 0 : n; | |
25 | + return (n < 1 ? 0 : (size_t)n); | |
26 | } | |
27 | /* }}} */ | |
28 |