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_fdopen.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_fdopen.c')
| -rw-r--r-- | src/Common/libzip/zip_fdopen.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/Common/libzip/zip_fdopen.c b/src/Common/libzip/zip_fdopen.c index a058f811..b1fc22bf 100644 --- a/src/Common/libzip/zip_fdopen.c +++ b/src/Common/libzip/zip_fdopen.c @@ -2,3 +2,3 @@ zip_fdopen.c -- open read-only archive from file descriptor - Copyright (C) 2009-2016 Dieter Baron and Thomas Klausner + Copyright (C) 2009-2017 Dieter Baron and Thomas Klausner @@ -19,3 +19,3 @@ written permission. - + THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS @@ -41,4 +41,3 @@ ZIP_EXTERN zip_t * -zip_fdopen(int fd_orig, int _flags, int *zep) -{ +zip_fdopen(int fd_orig, int _flags, int *zep) { int fd; @@ -49,7 +48,7 @@ zip_fdopen(int fd_orig, int _flags, int *zep) - if (_flags < 0 || (_flags & ZIP_TRUNCATE)) { + if (_flags < 0 || (_flags & ~(ZIP_CHECKCONS | ZIP_RDONLY))) { _zip_set_open_error(zep, NULL, ZIP_ER_INVAL); - return NULL; + return NULL; } - + /* We dup() here to avoid messing with the passed in fd. @@ -57,3 +56,3 @@ zip_fdopen(int fd_orig, int _flags, int *zep) - if ((fd=dup(fd_orig)) < 0) { + if ((fd = dup(fd_orig)) < 0) { _zip_set_open_error(zep, NULL, ZIP_ER_OPEN); @@ -62,3 +61,3 @@ zip_fdopen(int fd_orig, int _flags, int *zep) - if ((fp=fdopen(fd, "rb")) == NULL) { + if ((fp = fdopen(fd, "rb")) == NULL) { close(fd); |