diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2018-03-18 23:13:40 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2018-03-18 23:13:40 +0100 |
| commit | cd7a01c34fc4304ef8161ee617568f274ace5d24 (patch) | |
| tree | 41ed56e75a5feedc5f7d4fedb6338569d54d6076 /src/Common/libzip/zip_unchange.c | |
| parent | 49a8e52139b960afd3913053380190cf2d03ceda (diff) | |
| download | VeraCrypt-cd7a01c34fc4304ef8161ee617568f274ace5d24.tar.gz VeraCrypt-cd7a01c34fc4304ef8161ee617568f274ace5d24.zip | |
Windows: Update libzip to version 1.5.0 that include fixes for some security issues.
Diffstat (limited to 'src/Common/libzip/zip_unchange.c')
| -rw-r--r-- | src/Common/libzip/zip_unchange.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/Common/libzip/zip_unchange.c b/src/Common/libzip/zip_unchange.c index 4a3d6426..b0bd0787 100644 --- a/src/Common/libzip/zip_unchange.c +++ b/src/Common/libzip/zip_unchange.c @@ -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 @@ -38,18 +38,16 @@ ZIP_EXTERN int -zip_unchange(zip_t *za, zip_uint64_t idx) -{ +zip_unchange(zip_t *za, zip_uint64_t idx) { return _zip_unchange(za, idx, 0); } int -_zip_unchange(zip_t *za, zip_uint64_t idx, int allow_duplicates) -{ +_zip_unchange(zip_t *za, zip_uint64_t idx, int allow_duplicates) { zip_int64_t i; const char *orig_name, *changed_name; - + if (idx >= za->nentry) { zip_error_set(&za->error, ZIP_ER_INVAL, 0); return -1; @@ -57,7 +55,7 @@ _zip_unchange(zip_t *za, zip_uint64_t idx, int allow_duplicates) if (!allow_duplicates && za->entry[idx].changes && (za->entry[idx].changes->changed & ZIP_DIRENT_FILENAME)) { if (za->entry[idx].orig != NULL) { - if ((orig_name=_zip_get_name(za, idx, ZIP_FL_UNCHANGED, &za->error)) == NULL) { + if ((orig_name = _zip_get_name(za, idx, ZIP_FL_UNCHANGED, &za->error)) == NULL) { return -1; } @@ -70,8 +68,8 @@ _zip_unchange(zip_t *za, zip_uint64_t idx, int allow_duplicates) else { orig_name = NULL; } - - if ((changed_name=_zip_get_name(za, idx, 0, &za->error)) == NULL) { + + if ((changed_name = _zip_get_name(za, idx, 0, &za->error)) == NULL) { return -1; } @@ -89,7 +87,7 @@ _zip_unchange(zip_t *za, zip_uint64_t idx, int allow_duplicates) _zip_dirent_free(za->entry[idx].changes); za->entry[idx].changes = NULL; - _zip_unchange_data(za->entry+idx); + _zip_unchange_data(za->entry + idx); return 0; } |