Skip to content

Adds safety checks for getting lib path in symbol resolver #16671

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

Open
mghaznav wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −1
Open

Adds safety checks for getting lib path in symbol resolver #16671

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions Crashlytics/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Unreleased
- [fixed] Fixed an issue casuing a crash while symbolicating stack frames if the binary image path is null. (#16622)

# 12.18.0
- [removed] Removes unused integration with the now deprecated ObjC MetricKit API.

Expand Down
15 changes: 14 additions & 1 deletion Crashlytics/Crashlytics/Models/FIRCLSSymbolResolver.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,20 @@ - (BOOL)updateStackFrame:(FIRStackFrame*)frame {
[frame setOffset:addr - (uintptr_t)dlInfo.dli_saddr];
}

[frame setLibrary:[[binaryImage objectForKey:@"path"] lastPathComponent]];
NSString* library = nil;
id rawPath = [binaryImage objectForKey:@"path"];

if ([rawPath isKindOfClass:[NSString class]] && [(NSString*)rawPath length] > 0) {
library = [(NSString*)rawPath lastPathComponent];
} else if (dlInfo.dli_fname && strlen(dlInfo.dli_fname) > 0) {
library = [[NSString stringWithUTF8String:dlInfo.dli_fname] lastPathComponent];
}

if (library) {
[frame setLibrary:library];
} else {
FIRCLSSDKLog("Could not find library path\n");
}

return YES;
}
Expand Down
Loading