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

Windows: Update libzip to version 1.5.0 that include fixes for some security issues.

Browse Source
This commit is contained in:
Mounir IDRASSI
2018-03-18 23:13:40 +01:00
parent 49a8e52139
commit cd7a01c34f
118 changed files with 4666 additions and 3444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Common/libzip/zip_stat_init.c
View File

@@ -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
@@ -37,8 +37,7 @@
ZIP_EXTERN void
zip_stat_init(zip_stat_t *st)
{
zip_stat_init(zip_stat_t *st) {
st->valid = 0;
st->name = NULL;
st->index = ZIP_UINT64_MAX;
@@ -52,34 +51,33 @@ zip_stat_init(zip_stat_t *st)
int
_zip_stat_merge(zip_stat_t *dst, const zip_stat_t *src, zip_error_t *error)
{
_zip_stat_merge(zip_stat_t *dst, const zip_stat_t *src, zip_error_t *error) {
/* name is not merged, since zip_stat_t doesn't own it, and src may not be valid as long as dst */
if (src->valid & ZIP_STAT_INDEX) {
dst->index = src->index;
dst->index = src->index;
}
if (src->valid & ZIP_STAT_SIZE) {
dst->size = src->size;
dst->size = src->size;
}
if (src->valid & ZIP_STAT_COMP_SIZE) {
dst->comp_size = src->comp_size;
dst->comp_size = src->comp_size;
}
if (src->valid & ZIP_STAT_MTIME) {
dst->mtime = src->mtime;
dst->mtime = src->mtime;
}
if (src->valid & ZIP_STAT_CRC) {
dst->crc = src->crc;
dst->crc = src->crc;
}
if (src->valid & ZIP_STAT_COMP_METHOD) {
dst->comp_method = src->comp_method;
dst->comp_method = src->comp_method;
}
if (src->valid & ZIP_STAT_ENCRYPTION_METHOD) {
dst->encryption_method = src->encryption_method;
dst->encryption_method = src->encryption_method;
}
if (src->valid & ZIP_STAT_FLAGS) {
dst->flags = src->flags;
dst->flags = src->flags;
}
dst->valid |= src->valid;
return 0;
}