Fix #36365: scandir duplicates file name at every 65535th file#5439
Closed
cmb69 wants to merge 1 commit intophp:masterfrom
Closed
Fix #36365: scandir duplicates file name at every 65535th file#5439cmb69 wants to merge 1 commit intophp:masterfrom
cmb69 wants to merge 1 commit intophp:masterfrom
Conversation
Since DIR_W32.offset is declared as `uint16_t`, we have an overflow for directories with many entries. This patch changes the field to `uint32_t`.
Member
|
Any ABI stability concerns here? |
Member
Author
Yes, therefore targeting master only. |
nikic
approved these changes
Apr 24, 2020
Member
Author
|
Thanks! Applied as 767a77a. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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 DIR_W32.offset is declared as
uint16_t, we have an overflow fordirectories with many entries. This patch changes the field to
uint32_t.The test is slow, but if commit 4e8f01c had a respective test case, we wouldn't have had that regression.
Note that there might be room for optimization on 32bit architectures, namely by merging
offsetandfinishedin auint32_tbitfield; not sure if that worth it.