diff options
Diffstat (limited to 'src/Common/libzip/zip_source_read.c')
| -rw-r--r-- | src/Common/libzip/zip_source_read.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/Common/libzip/zip_source_read.c b/src/Common/libzip/zip_source_read.c index 267128ba..83514c6e 100644 --- a/src/Common/libzip/zip_source_read.c +++ b/src/Common/libzip/zip_source_read.c @@ -1,6 +1,6 @@ /* zip_source_read.c -- read data from zip_source - Copyright (C) 2009-2016 Dieter Baron and Thomas Klausner + Copyright (C) 2009-2017 Dieter Baron and Thomas Klausner This file is part of libzip, a library to manipulate ZIP archives. The authors can be contacted at <libzip@nih.at> @@ -17,7 +17,7 @@ 3. The names of the authors may not be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -36,20 +36,19 @@ zip_int64_t -zip_source_read(zip_source_t *src, void *data, zip_uint64_t len) -{ +zip_source_read(zip_source_t *src, void *data, zip_uint64_t len) { zip_uint64_t bytes_read; zip_int64_t n; if (src->source_closed) { - return -1; + return -1; } if (!ZIP_SOURCE_IS_OPEN_READING(src) || len > ZIP_INT64_MAX || (len > 0 && data == NULL)) { - zip_error_set(&src->error, ZIP_ER_INVAL, 0); + zip_error_set(&src->error, ZIP_ER_INVAL, 0); return -1; } - if (_zip_source_had_error(src)) { + if (src->had_read_error) { return -1; } @@ -57,9 +56,14 @@ zip_source_read(zip_source_t *src, void *data, zip_uint64_t len) return 0; } + if (len == 0) { + return 0; + } + bytes_read = 0; while (bytes_read < len) { if ((n = _zip_source_call(src, (zip_uint8_t *)data + bytes_read, len - bytes_read, ZIP_SOURCE_READ)) < 0) { + src->had_read_error = true; if (bytes_read == 0) { return -1; } @@ -81,7 +85,6 @@ zip_source_read(zip_source_t *src, void *data, zip_uint64_t len) bool -_zip_source_eof(zip_source_t *src) -{ +_zip_source_eof(zip_source_t *src) { return src->eof; } |