Fix FileSystemService dirent parsing on macOS#594
Open
sentry[bot] wants to merge 1 commit into
Open
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
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.
This PR addresses an
EXC_BAD_ACCESS(KERN_INVALID_ADDRESS) crash occurring inFileSystemService.listDirectoryWithIgnoreDetectionandscandirListDirectoryon macOS.Root Cause:
On macOS, the
direntstruct returned byreaddiris variable-length, with its actual size determined by the filename length. The previous implementation copieddirentPtr.pointee, which attempts to read a fixed-sizedirentstruct. This could extend beyond the kernel's allocated buffer for the specific directory entry into unmapped memory, leading to a crash.Solution:
decodeDirentName,descriptorRelativeMode, andfileTypeFallbacknow acceptUnsafeMutablePointer<dirent>orData(for name bytes) instead ofdirentby value.direntField Access: On macOS,decodeDirentNamenow uses raw pointer arithmetic to readd_namlenandd_namebytes directly from thedirentpointer, ensuring reads are strictly within the allocated bounds. This avoids copying the entire variable-length struct.listDirectoryWithIgnoreDetectionandscandirListDirectoryno longer performdirentPtr.pointeecopies. Instead, they pass thedirentpointer directly to the updated helper functions and readd_typevia raw pointer access on macOS.Fixes REPOPROMPT-9V