1 files changed, 73 insertions, 74 deletions
diff --git a/src/Common/libzip/zip_source_zip_new.c b/src/Common/libzip/zip_source_zip_new.c
index 6d547f0e..68394b78 100644
--- a/src/Common/libzip/zip_source_zip_new.c
+++ b/src/Common/libzip/zip_source_zip_new.c
@@ -1,9 +1,9 @@
 /*
   zip_source_zip_new.c -- prepare data structures for zip_fopen/zip_source_zip
-  Copyright (C) 2012-2019 Dieter Baron and Thomas Klausner
+  Copyright (C) 2012-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
@@ -38,50 +38,45 @@
 
 static void _zip_file_attributes_from_dirent(zip_file_attributes_t *attributes, zip_dirent_t *de);
 
-zip_source_t *
-_zip_source_zip_new(zip_t *za, zip_t *srcza, zip_uint64_t srcidx, zip_flags_t flags, zip_uint64_t start, zip_uint64_t len, const char *password) {
+zip_source_t *_zip_source_zip_new(zip_t *srcza, zip_uint64_t srcidx, zip_flags_t flags, zip_uint64_t start, zip_uint64_t len, const char *password, zip_error_t *error) {
     zip_source_t *src, *s2;
     zip_stat_t st;
     zip_file_attributes_t attributes;
     zip_dirent_t *de;
     bool partial_data, needs_crc, needs_decrypt, needs_decompress;
 
-    if (za == NULL) {
-	return NULL;
-    }
-
-    if (srcza == NULL || srcidx >= srcza->nentry) {
-	zip_error_set(&za->error, ZIP_ER_INVAL, 0);
-	return NULL;
+    if (srcza == NULL || srcidx >= srcza->nentry || len > ZIP_INT64_MAX) {
+        zip_error_set(error, ZIP_ER_INVAL, 0);
+        return NULL;
     }
 
     if ((flags & ZIP_FL_UNCHANGED) == 0 && (ZIP_ENTRY_DATA_CHANGED(srcza->entry + srcidx) || srcza->entry[srcidx].deleted)) {
-	zip_error_set(&za->error, ZIP_ER_CHANGED, 0);
-	return NULL;
+        zip_error_set(error, ZIP_ER_CHANGED, 0);
+        return NULL;
     }
 
     if (zip_stat_index(srcza, srcidx, flags | ZIP_FL_UNCHANGED, &st) < 0) {
-	zip_error_set(&za->error, ZIP_ER_INTERNAL, 0);
-	return NULL;
+        zip_error_set(error, ZIP_ER_INTERNAL, 0);
+        return NULL;
     }
 
     if (flags & ZIP_FL_ENCRYPTED) {
-	flags |= ZIP_FL_COMPRESSED;
+        flags |= ZIP_FL_COMPRESSED;
     }
 
     if ((start > 0 || len > 0) && (flags & ZIP_FL_COMPRESSED)) {
-	zip_error_set(&za->error, ZIP_ER_INVAL, 0);
-	return NULL;
+        zip_error_set(error, ZIP_ER_INVAL, 0);
+        return NULL;
     }
 
     /* overflow or past end of file */
     if ((start > 0 || len > 0) && (start + len < start || start + len > st.size)) {
-	zip_error_set(&za->error, ZIP_ER_INVAL, 0);
-	return NULL;
+        zip_error_set(error, ZIP_ER_INVAL, 0);
+        return NULL;
     }
 
     if (len == 0) {
-	len = st.size - start;
+        len = st.size - start;
     }
 
     partial_data = len < st.size;
@@ -91,89 +86,93 @@ _zip_source_zip_new(zip_t *za, zip_t *srcza, zip_uint64_t srcidx, zip_flags_t fl
     needs_crc = ((flags & ZIP_FL_COMPRESSED) == 0 || st.comp_method == ZIP_CM_STORE) && !partial_data;
 
     if (needs_decrypt) {
-	if (password == NULL) {
-	    password = za->default_password;
-	}
-	if (password == NULL) {
-	    zip_error_set(&za->error, ZIP_ER_NOPASSWD, 0);
-	    return NULL;
-	}
+        if (password == NULL) {
+            password = srcza->default_password;
+        }
+        if (password == NULL) {
+            zip_error_set(error, ZIP_ER_NOPASSWD, 0);
+            return NULL;
+        }
     }
 
-    if ((de = _zip_get_dirent(srcza, srcidx, flags, &za->error)) == NULL) {
-	return NULL;
+    if ((de = _zip_get_dirent(srcza, srcidx, flags, error)) == NULL) {
+        return NULL;
     }
     _zip_file_attributes_from_dirent(&attributes, de);
 
     if (st.comp_size == 0) {
-	return zip_source_buffer_with_attributes(za, NULL, 0, 0, &attributes);
+        return zip_source_buffer_with_attributes_create(NULL, 0, 0, &attributes, error);
     }
 
     if (partial_data && !needs_decrypt && !needs_decompress) {
-	struct zip_stat st2;
+        struct zip_stat st2;
 
-	st2.size = len;
-	st2.comp_size = len;
-	st2.comp_method = ZIP_CM_STORE;
-	st2.mtime = st.mtime;
-	st2.valid = ZIP_STAT_SIZE | ZIP_STAT_COMP_SIZE | ZIP_STAT_COMP_METHOD | ZIP_STAT_MTIME;
+        st2.size = len;
+        st2.comp_size = len;
+        st2.comp_method = ZIP_CM_STORE;
+        st2.mtime = st.mtime;
+        st2.valid = ZIP_STAT_SIZE | ZIP_STAT_COMP_SIZE | ZIP_STAT_COMP_METHOD | ZIP_STAT_MTIME;
 
-	if ((src = _zip_source_window_new(srcza->src, start, len, &st2, &attributes, srcza, srcidx, &za->error)) == NULL) {
-	    return NULL;
-	}
+        if ((src = _zip_source_window_new(srcza->src, start, (zip_int64_t)len, &st2, &attributes, srcza, srcidx, error)) == NULL) {
+            return NULL;
+        }
     }
     else {
-	if ((src = _zip_source_window_new(srcza->src, 0, st.comp_size, &st, &attributes, srcza, srcidx, &za->error)) == NULL) {
-	    return NULL;
-	}
+        if (st.comp_size > ZIP_INT64_MAX) {
+            zip_error_set(error, ZIP_ER_INVAL, 0);
+            return NULL;
+        }
+        if ((src =  _zip_source_window_new(srcza->src, 0, (zip_int64_t)st.comp_size, &st, &attributes, srcza, srcidx, error)) == NULL) {
+            return NULL;
+        }
     }
 
     if (_zip_source_set_source_archive(src, srcza) < 0) {
-	zip_source_free(src);
-	return NULL;
+        zip_source_free(src);
+        return NULL;
     }
 
     /* creating a layered source calls zip_keep() on the lower layer, so we free it */
 
     if (needs_decrypt) {
-	zip_encryption_implementation enc_impl;
+        zip_encryption_implementation enc_impl;
 
-	if ((enc_impl = _zip_get_encryption_implementation(st.encryption_method, ZIP_CODEC_DECODE)) == NULL) {
-	    zip_error_set(&za->error, ZIP_ER_ENCRNOTSUPP, 0);
-	    return NULL;
-	}
+        if ((enc_impl = _zip_get_encryption_implementation(st.encryption_method, ZIP_CODEC_DECODE)) == NULL) {
+            zip_error_set(error, ZIP_ER_ENCRNOTSUPP, 0);
+            return NULL;
+        }
 
-	s2 = enc_impl(za, src, st.encryption_method, 0, password);
-	zip_source_free(src);
-	if (s2 == NULL) {
-	    return NULL;
-	}
-	src = s2;
+        s2 = enc_impl(srcza, src, st.encryption_method, 0, password);
+        zip_source_free(src);
+        if (s2 == NULL) {
+            return NULL;
+        }
+        src = s2;
     }
     if (needs_decompress) {
-	s2 = zip_source_decompress(za, src, st.comp_method);
-	zip_source_free(src);
-	if (s2 == NULL) {
-	    return NULL;
-	}
-	src = s2;
+        s2 = zip_source_decompress(srcza, src, st.comp_method);
+        zip_source_free(src);
+        if (s2 == NULL) {
+            return NULL;
+        }
+        src = s2;
     }
     if (needs_crc) {
-	s2 = zip_source_crc(za, src, 1);
-	zip_source_free(src);
-	if (s2 == NULL) {
-	    return NULL;
-	}
-	src = s2;
+        s2 = zip_source_crc_create(src, 1, error);
+        zip_source_free(src);
+        if (s2 == NULL) {
+            return NULL;
+        }
+        src = s2;
     }
 
     if (partial_data && (needs_decrypt || needs_decompress)) {
-	s2 = zip_source_window(za, src, start, len);
-	zip_source_free(src);
-	if (s2 == NULL) {
-	    return NULL;
-	}
-	src = s2;
+        s2 = zip_source_window_create(src, start, (zip_int64_t)len, error);
+        zip_source_free(src);
+        if (s2 == NULL) {
+            return NULL;
+        }
+        src = s2;
     }
 
     return src;