Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-13 11:58:26 -06:00
Code Activity

Update Libzip to latest 1.9.2 (#1071)

Browse Source 
* Libzip 1.9.2

Updated Libzip to latest version 1.9.2 and changed version number in the config.h from 1.7.3 to 1.9.2. Not sure if anything else needs to be tweaked :)

* Modified Libzip to work with Visual studio

* Update README.md

Update libzip copyright.

* Added the missing files.

I've added the missing files zipconf.h and config.h, I've missed those sorry for that!
This commit is contained in:
DLL125
2023-05-25 12:52:53 +02:00
committed by GitHub
parent b872702309
commit 1fc4168b81
145 changed files with 8187 additions and 3942 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/Common/libzip/zip_source_read.c
View File

@@ -1,9 +1,9 @@
/*
zip_source_read.c -- read data from zip_source
Copyright (C) 2009-2019 Dieter Baron and Thomas Klausner
Copyright (C) 2009-2021 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>
The authors can be contacted at <info@libzip.org>
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
@@ -41,45 +41,51 @@ zip_source_read(zip_source_t *src, void *data, zip_uint64_t len) {
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);
return -1;
zip_error_set(&src->error, ZIP_ER_INVAL, 0);
return -1;
}
if (src->had_read_error) {
return -1;
return -1;
}
if (_zip_source_eof(src)) {
return 0;
return 0;
}
if (len == 0) {
return 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;
}
else {
return (zip_int64_t)bytes_read;
}
}
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;
}
else {
return (zip_int64_t)bytes_read;
}
}
if (n == 0) {
src->eof = 1;
break;
}
if (n == 0) {
src->eof = 1;
break;
}
bytes_read += (zip_uint64_t)n;
bytes_read += (zip_uint64_t)n;
}
if (src->bytes_read + bytes_read < src->bytes_read) {
src->bytes_read = ZIP_UINT64_MAX;
}
else {
src->bytes_read += bytes_read;
}
return (zip_int64_t)bytes_read;
}