diff options
Diffstat (limited to 'src/Common')
| -rw-r--r-- | src/Common/libzip/NEWS.md | 11 | ||||
| -rw-r--r-- | src/Common/libzip/zip_dirent.c | 2 | ||||
| -rw-r--r-- | src/Common/libzip/zip_source_buffer.c | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/Common/libzip/NEWS.md b/src/Common/libzip/NEWS.md index a4bc5f9b..ab2be0a3 100644 --- a/src/Common/libzip/NEWS.md +++ b/src/Common/libzip/NEWS.md @@ -1,3 +1,14 @@ +1.5.1 [2018-04-11] +================== + +* Choose format of installed documentation based on available tools. +* Fix visibility of symbols. +* Fix zipcmp directory support. +* Don't set RPATH on Linux. +* Use Libs.private for link dependencies in pkg-config file. +* Fix build with LibreSSL. +* Various bugfixes. + 1.5.0 [2018-03-11] ================== diff --git a/src/Common/libzip/zip_dirent.c b/src/Common/libzip/zip_dirent.c index 060e1e95..a6dbfac8 100644 --- a/src/Common/libzip/zip_dirent.c +++ b/src/Common/libzip/zip_dirent.c @@ -536,7 +536,7 @@ _zip_dirent_read(zip_dirent_t *zde, zip_source_t *src, zip_buffer_t *buffer, boo if (zde->offset == ZIP_UINT32_MAX) zde->offset = _zip_buffer_get_64(ef_buffer); if (zde->disk_number == ZIP_UINT16_MAX) - zde->disk_number = _zip_buffer_get_32(buffer); + zde->disk_number = _zip_buffer_get_32(ef_buffer); } if (!_zip_buffer_eof(ef_buffer)) { diff --git a/src/Common/libzip/zip_source_buffer.c b/src/Common/libzip/zip_source_buffer.c index 05ade4ac..d2bc8ad9 100644 --- a/src/Common/libzip/zip_source_buffer.c +++ b/src/Common/libzip/zip_source_buffer.c @@ -562,7 +562,7 @@ buffer_write(buffer_t *buffer, const zip_uint8_t *data, zip_uint64_t length, zip memcpy(buffer->fragments[i].data + fragment_offset, data + n, left); - if (n == buffer->fragments[i].length - fragment_offset) { + if (left == buffer->fragments[i].length - fragment_offset) { i++; } n += left; |