-
Notifications
You must be signed in to change notification settings - Fork 128
[PLAT-16992] Incorrect-stack-trace-on-iOS #1947
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.
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
SB-meiyalaganr
wants to merge
3
commits into
meiy/Feature/plat-16992-Incorrect-Stack-Trace-On-iOS
Choose a base branch
from
meiy/plat-16992-Incorrect-stack-trace-on-iOS
base: meiy/Feature/plat-16992-Incorrect-Stack-Trace-On-iOS
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
49 changes: 49 additions & 0 deletions
49
Bugsnag/KSCrash/Source/KSCrash/Recording/Sentry/BSG_KSCrashSentry_CPPException_Private.h
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| // | ||
| // BSG_KSCrashSentry_CPPException_Private.h | ||
| // Bugsnag | ||
| // | ||
| // Created by Meiyalagan Ramadurai on 27/08/26. | ||
| // Copyright © 2026 Bugsnag Inc. All rights reserved. | ||
| // | ||
|
|
||
| #ifndef BSG_KSCrashSentry_CPPException_Private_h | ||
| #define BSG_KSCrashSentry_CPPException_Private_h | ||
|
|
||
| #include <stdint.h> | ||
|
|
||
| #ifdef __cplusplus | ||
|
|
||
| static constexpr int BSG_KSCPPExceptionStackTraceCapacity = 30; | ||
|
|
||
| struct BSG_KSCPPExceptionThreadState { | ||
| bool captureNextStackTrace = true; | ||
| uintptr_t stackTrace[BSG_KSCPPExceptionStackTraceCapacity] = {}; | ||
| int stackTraceCount = 0; | ||
| }; | ||
|
|
||
| struct BSG_KSCPPExceptionStackTraceView { | ||
| uintptr_t *stackTrace; | ||
| int stackTraceLength; | ||
| }; | ||
|
|
||
| inline BSG_KSCPPExceptionThreadState &bsg_kscrashsentry_cppExceptionThreadState(void) { | ||
| static thread_local BSG_KSCPPExceptionThreadState state; | ||
| return state; | ||
| } | ||
|
|
||
| inline BSG_KSCPPExceptionStackTraceView bsg_kscrashsentry_cppExceptionStackTraceView( | ||
| BSG_KSCPPExceptionThreadState &state, int framesToSkip) { | ||
| if (framesToSkip < 0) { | ||
| framesToSkip = 0; | ||
| } | ||
| const int stackTraceLength = state.stackTraceCount > framesToSkip | ||
| ? state.stackTraceCount - framesToSkip : 0; | ||
| return { | ||
| stackTraceLength > 0 ? state.stackTrace + framesToSkip : nullptr, | ||
| stackTraceLength, | ||
| }; | ||
| } | ||
|
|
||
| #endif __cplusplus | ||
|
|
||
| #endif // BSG_KSCrashSentry_CPPException_Private_h |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| // | ||
| // KSCrashSentry_CPPException_Tests.mm | ||
| // Bugsnag | ||
| // | ||
| // Created by Meiyalagan Ramadurai on 27/08/26. | ||
| // Copyright © 2026 Bugsnag Inc. All rights reserved. | ||
| // | ||
|
|
||
| #import <XCTest/XCTest.h> | ||
|
|
||
| #include "BSG_KSCrashSentry_CPPException_Private.h" | ||
|
SB-meiyalaganr marked this conversation as resolved.
|
||
|
|
||
| #include <atomic> | ||
| #include <thread> | ||
|
|
||
| @interface KSCrashSentry_CPPException_Tests : XCTestCase | ||
| @end | ||
|
|
||
| @implementation KSCrashSentry_CPPException_Tests | ||
|
|
||
| - (void)tearDown { | ||
| bsg_kscrashsentry_cppExceptionThreadState() = BSG_KSCPPExceptionThreadState{}; | ||
| [super tearDown]; | ||
| } | ||
|
|
||
| - (void)testExceptionStateIsIsolatedByThread { | ||
| BSG_KSCPPExceptionThreadState &mainState = bsg_kscrashsentry_cppExceptionThreadState(); | ||
| mainState.captureNextStackTrace = false; | ||
| mainState.stackTrace[0] = 0xa; | ||
| mainState.stackTraceCount = 1; | ||
|
|
||
| std::atomic<bool> workerSawDefaults{false}; | ||
| std::thread worker([&] { | ||
| BSG_KSCPPExceptionThreadState &workerState = | ||
| bsg_kscrashsentry_cppExceptionThreadState(); | ||
| workerSawDefaults.store(workerState.captureNextStackTrace && | ||
| workerState.stackTrace[0] == 0 && | ||
| workerState.stackTraceCount == 0); | ||
| workerState.captureNextStackTrace = false; | ||
| workerState.stackTrace[0] = 0xb; | ||
| workerState.stackTraceCount = 2; | ||
| }); | ||
| worker.join(); | ||
|
|
||
| XCTAssertTrue(workerSawDefaults.load()); | ||
| XCTAssertFalse(mainState.captureNextStackTrace); | ||
| XCTAssertEqual(mainState.stackTrace[0], (uintptr_t)0xa); | ||
| XCTAssertEqual(mainState.stackTraceCount, 1); | ||
| } | ||
|
|
||
| - (void)testStackTraceViewSkipsInternalFrames { | ||
| BSG_KSCPPExceptionThreadState state; | ||
| state.stackTraceCount = 4; | ||
| for (int index = 0; index < state.stackTraceCount; index++) { | ||
| state.stackTrace[index] = (uintptr_t)(100 + index); | ||
| } | ||
|
|
||
| BSG_KSCPPExceptionStackTraceView view = | ||
| bsg_kscrashsentry_cppExceptionStackTraceView(state, 2); | ||
|
|
||
| XCTAssertEqual(view.stackTraceLength, 2); | ||
| XCTAssertEqual(view.stackTrace, state.stackTrace + 2); | ||
| XCTAssertEqual(view.stackTrace[0], (uintptr_t)102); | ||
| } | ||
|
|
||
| - (void)testStackTraceViewSafelyHandlesShortAndInvalidCounts { | ||
| for (int count : {-1, 0, 1, 2}) { | ||
| BSG_KSCPPExceptionThreadState state; | ||
| state.stackTraceCount = count; | ||
|
|
||
| BSG_KSCPPExceptionStackTraceView view = | ||
| bsg_kscrashsentry_cppExceptionStackTraceView(state, 2); | ||
|
|
||
| XCTAssertEqual(view.stackTraceLength, 0, @"count = %d", count); | ||
| XCTAssertEqual(view.stackTrace, nullptr, @"count = %d", count); | ||
| } | ||
| } | ||
|
|
||
| @end | ||
|
|
||
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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.