-
Notifications
You must be signed in to change notification settings - Fork 329
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Minor bugfix to mz_zip_writer_add_from_zip_reader() discovered on the…
… zip64 branch - should be a harmless bug because I don't think the central dir offsets are actually used during writing in this build (but they are in the next one).
- Loading branch information
1 parent
9311207
commit 28f5066
Showing
1 changed file
with
3 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,7 @@ | |
MINIZ_NO_ARCHIVE_APIS, or to get rid of all stdio usage define MINIZ_NO_STDIO (see the list below for more macros). | ||
* Change History | ||
10/13/13 v1.15 r3 - Interim bugfix release while I work on the next major release with Zip64 support (almost there!): | ||
10/13/13 v1.15 r4 - Interim bugfix release while I work on the next major release with Zip64 support (almost there!): | ||
- Critical fix for the MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY bug (thanks [email protected]) which could cause locate files to not find files. This bug | ||
would only have occured in earlier versions if you explicitly used this flag, OR if you used mz_zip_extract_archive_file_to_heap() or mz_zip_add_mem_to_archive_file_in_place() | ||
(which used this flag). If you can't switch to v1.15 but want to fix this bug, just remove the uses of this flag from both helper funcs (and of course don't use the flag). | ||
|
@@ -27,6 +27,7 @@ | |
- Added example6.c, which dumps an image of the mandelbrot set to a PNG file. | ||
- Modified example2 to help test the MZ_ZIP_FLAG_DO_NOT_SORT_CENTRAL_DIRECTORY flag more. | ||
- In r3: Bugfix to mz_zip_writer_add_file() found during merge: Fix possible src file fclose() leak if alignment bytes+local header file write faiiled | ||
- In r4: Minor bugfix to mz_zip_writer_add_from_zip_reader(): Was pushing the wrong central dir header offset, appears harmless in this release, but it became a problem in the zip64 branch | ||
5/20/12 v1.14 - MinGW32/64 GCC 4.6.1 compiler fixes: added MZ_FORCEINLINE, #include <time.h> (thanks fermtect). | ||
5/19/12 v1.13 - From [email protected] and [email protected] - Fix mz_crc32() so it doesn't compute the wrong CRC-32's when mz_ulong is 64-bit. | ||
- Temporarily/locally slammed in "typedef unsigned long mz_ulong" and re-ran a randomized regression test on ~500k files. | ||
|
@@ -4696,7 +4697,7 @@ mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, mz_zip_archive * | |
|
||
if (pState->m_central_dir.m_size > 0xFFFFFFFF) | ||
return MZ_FALSE; | ||
n = (mz_uint32)pState->m_central_dir.m_size; | ||
n = (mz_uint32)orig_central_dir_size; | ||
if (!mz_zip_array_push_back(pZip, &pState->m_central_dir_offsets, &n, 1)) | ||
{ | ||
mz_zip_array_resize(pZip, &pState->m_central_dir, orig_central_dir_size, MZ_FALSE); | ||
|