Make pattern in mz_zip_reader dynamically assigned
#856
+19
−2
Conversation
This file contains hidden or 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
nmoinvaz
reviewed
Apr 15, 2025
mz_zip_rw.c
Outdated
| return; | ||
| free(reader->pattern); | ||
| reader->pattern = NULL; | ||
| if(pattern) |
mz_zip_rw.c
Outdated
| @@ -905,7 +910,19 @@ int32_t mz_zip_reader_save_all(void *handle, const char *destination_dir) { | |||
|
|
|||
| void mz_zip_reader_set_pattern(void *handle, const char *pattern, uint8_t ignore_case) { | |||
| mz_zip_reader *reader = (mz_zip_reader *)handle; | |||
| reader->pattern = pattern; | |||
| if(!reader) /* pattern can be NULL */ | |||
mz_zip_rw.c
Outdated
| free(reader->pattern); | ||
| reader->pattern = NULL; | ||
| if(pattern) | ||
| { |
mz_zip_rw.c
Outdated
| { | ||
| int32_t pattern_size = (int32_t)strlen(pattern); | ||
| reader->pattern = (char *)calloc(pattern_size + 1, sizeof(char)); | ||
| if(!reader->pattern) |
Coeur
reviewed
Apr 16, 2025
| @@ -230,6 +230,11 @@ int32_t mz_zip_reader_close(void *handle) { | |||
| mz_stream_delete(&reader->mem_stream); | |||
| } | |||
|
|
|||
| if (reader->pattern) { | |||
There was a problem hiding this comment.
On line 915 you didn't put any if, so why putting one here? You can probably remove it from line 233.
There was a problem hiding this comment.
I referred to the mz_zip.c code, which is the similar code in mz_zip_set_comment and mz_zip_close. But the if in line 233 seems unnecessary indeed, I could remove it later.
nmoinvaz
approved these changes
Apr 16, 2025
Coeur
added a commit
to Coeur/minizip
that referenced
this pull request
May 9, 2025
nmoinvaz
pushed a commit
that referenced
this pull request
May 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Since
patternshould be used along with the usage of functions likemz_zip_reader_goto_next_entry, and one could put a dynamically-assignedpatternin another function, which makes it difficult to free the original string, there's need to make thepatterninmz_zip_readerdynamically assigned, and the old string can be freed immediately.