Skip to content

Skip empty/invalid records/certs in MacOS keychain files #22927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 18, 2025
Merged

Skip empty/invalid records/certs in MacOS keychain files #22927

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions lib/std/crypto/Certificate/Bundle/macos.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,16 @@ pub fn rescanMac(cb: *Bundle, gpa: Allocator) RescanMacError!void {
}

for (record_list) |record_offset| {
// An offset of zero means that the record is not present.
// An offset that is not 4-byte-aligned is invalid.
if (record_offset == 0 or record_offset % 4 != 0) continue;

try stream.seekTo(db_header.schema_offset + table_offset + record_offset);

const cert_header = try reader.readStructEndian(X509CertHeader, .big);

if (cert_header.cert_size == 0) continue;

try cb.bytes.ensureUnusedCapacity(gpa, cert_header.cert_size);

const cert_start = @as(u32, @intCast(cb.bytes.items.len));
Expand Down