mirror of
https://github.com/GerbilSoft/minizip-ng.git
synced 2025-06-18 11:35:34 -04:00
Revert: Make pattern
in mz_zip_reader
dynamically assigned (#856)
Some checks failed
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_BZIP=OFF, ubuntu_clang_no_bzip2, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang No Bzip2, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_COMPRESS_ONLY=ON, ubuntu_clang_compress_only, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang Compress Only, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_DECOMPRESS_ONLY=ON, ubuntu_clang_decompress_only, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang Decompress Only, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_FORCE_FETCH_LIBS=ON -G Ninja, windows_gcc, gcc, g++, Windows GCC Code Coverage, windows-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_LIBCOMP=ON, macos_xcode_libcompression, macOS Xcode LibCompression, macOS-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_LZMA=OFF, ubuntu_clang_no_lzma, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang No LZMA, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_OPENSSL=ON, macos_xcode_openssl, macOS Xcode OpenSSL, macos-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_OPENSSL=ON, ubuntu_clang_openssl, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang OpenSSL, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_PKCRYPT=OFF -D MZ_WZAES=OFF, ubuntu_clang_no_encryption, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang No Encryption, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_PKCRYPT=OFF, ubuntu_clang_no_pkcrypt, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang No Pkcrypt, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_WZAES=OFF, ubuntu_clang_no_winzip_aes, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang No Winzip AES, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_ZLIB=OFF, ubuntu_clang_no_zlib, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang No Zlib, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_ZSTD=OFF, ubuntu_clang_no_zstd, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang No Zstd, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON, macos_xcode, macOS Xcode Code Coverage, macOS-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON, ubuntu_clang, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON, ubuntu_gcc, gcc, g++, Ubuntu GCC, ubuntu-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_FORCE_FETCH_LIBS=ON, cl, true, windows, Windows MSVC, windows-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_SANITIZER=Address, ubuntu_gcc_asan, gcc, g++, Ubuntu GCC ASAN, ubuntu-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_SANITIZER=Memory, ubuntu_gcc_msan, gcc, g++, Ubuntu GCC MSAN, ubuntu-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_SANITIZER=Undefined, ubuntu_gcc_undefined, gcc, g++, Ubuntu GCC UBSAN, ubuntu-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (../build, ../minizip-ng, gcc, g++, Ubuntu GCC OSB, ubuntu-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (clang, clang++, true, linux, Ubuntu 22 Clang, ubuntu-22.04) (push) Has been cancelled
Build / ${{ matrix.name }} (clang-11, clang++-11, Ubuntu 22 Clang 11, ubuntu-22.04, llvm-11 clang-11, 11) (push) Has been cancelled
Build / ${{ matrix.name }} (true, macos, macOS Xcode, macos-latest) (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
Some checks failed
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_BZIP=OFF, ubuntu_clang_no_bzip2, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang No Bzip2, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_COMPRESS_ONLY=ON, ubuntu_clang_compress_only, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang Compress Only, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_DECOMPRESS_ONLY=ON, ubuntu_clang_decompress_only, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang Decompress Only, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_FORCE_FETCH_LIBS=ON -G Ninja, windows_gcc, gcc, g++, Windows GCC Code Coverage, windows-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_LIBCOMP=ON, macos_xcode_libcompression, macOS Xcode LibCompression, macOS-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_LZMA=OFF, ubuntu_clang_no_lzma, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang No LZMA, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_OPENSSL=ON, macos_xcode_openssl, macOS Xcode OpenSSL, macos-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_OPENSSL=ON, ubuntu_clang_openssl, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang OpenSSL, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_PKCRYPT=OFF -D MZ_WZAES=OFF, ubuntu_clang_no_encryption, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang No Encryption, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_PKCRYPT=OFF, ubuntu_clang_no_pkcrypt, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang No Pkcrypt, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_WZAES=OFF, ubuntu_clang_no_winzip_aes, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang No Winzip AES, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_ZLIB=OFF, ubuntu_clang_no_zlib, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang No Zlib, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON -D MZ_ZSTD=OFF, ubuntu_clang_no_zstd, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang No Zstd, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON, macos_xcode, macOS Xcode Code Coverage, macOS-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON, ubuntu_clang, clang-14, clang++-14, llvm-cov-14 gcov, Ubuntu Clang, ubuntu-latest, clang-14 llvm-14) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_CODE_COVERAGE=ON, ubuntu_gcc, gcc, g++, Ubuntu GCC, ubuntu-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_FORCE_FETCH_LIBS=ON, cl, true, windows, Windows MSVC, windows-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_SANITIZER=Address, ubuntu_gcc_asan, gcc, g++, Ubuntu GCC ASAN, ubuntu-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_SANITIZER=Memory, ubuntu_gcc_msan, gcc, g++, Ubuntu GCC MSAN, ubuntu-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (-D MZ_SANITIZER=Undefined, ubuntu_gcc_undefined, gcc, g++, Ubuntu GCC UBSAN, ubuntu-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (../build, ../minizip-ng, gcc, g++, Ubuntu GCC OSB, ubuntu-latest) (push) Has been cancelled
Build / ${{ matrix.name }} (clang, clang++, true, linux, Ubuntu 22 Clang, ubuntu-22.04) (push) Has been cancelled
Build / ${{ matrix.name }} (clang-11, clang++-11, Ubuntu 22 Clang 11, ubuntu-22.04, llvm-11 clang-11, 11) (push) Has been cancelled
Build / ${{ matrix.name }} (true, macos, macOS Xcode, macos-latest) (push) Has been cancelled
CodeQL / Analyze (push) Has been cancelled
This commit is contained in:
parent
799086de42
commit
378a4ebc55
19
mz_zip_rw.c
19
mz_zip_rw.c
@ -39,7 +39,7 @@ typedef struct mz_zip_reader_s {
|
||||
uint16_t hash_algorithm;
|
||||
uint16_t hash_digest_size;
|
||||
mz_zip_file *file_info;
|
||||
char *pattern;
|
||||
const char *pattern;
|
||||
uint8_t pattern_ignore_case;
|
||||
const char *password;
|
||||
void *overwrite_userdata;
|
||||
@ -230,11 +230,6 @@ int32_t mz_zip_reader_close(void *handle) {
|
||||
mz_stream_delete(&reader->mem_stream);
|
||||
}
|
||||
|
||||
if (reader->pattern) {
|
||||
free(reader->pattern);
|
||||
reader->pattern = NULL;
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
@ -912,17 +907,7 @@ void mz_zip_reader_set_pattern(void *handle, const char *pattern, uint8_t ignore
|
||||
mz_zip_reader *reader = (mz_zip_reader *)handle;
|
||||
if (!reader)
|
||||
return;
|
||||
free(reader->pattern);
|
||||
reader->pattern = NULL;
|
||||
if (pattern) {
|
||||
/* pattern can be NULL */
|
||||
int32_t pattern_size = (int32_t)strlen(pattern);
|
||||
reader->pattern = (char *)calloc(pattern_size + 1, sizeof(char));
|
||||
if (!reader->pattern)
|
||||
/* Reference: `mz_zip_set_comment`, should return MZ_MEM_ERROR */
|
||||
return;
|
||||
strncpy(reader->pattern, pattern, pattern_size);
|
||||
}
|
||||
reader->pattern = pattern;
|
||||
reader->pattern_ignore_case = ignore_case;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user