Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

### Fixes

- Use React `componentStack` as fallback when error has no stack trace on Android ([#5965](https://github.com/getsentry/sentry-react-native/pull/5965)
- Add `SENTRY_PROJECT_ROOT` env var to override project root in Xcode build phase scripts for monorepo setups ([#5961](https://github.com/getsentry/sentry-react-native/pull/5961))

### Features
Expand Down
17 changes: 17 additions & 0 deletions packages/core/src/js/integrations/reactnativeerrorhandlers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,16 @@ function setupErrorUtilsGlobalHandler(): void {
return;
}

// React render errors may arrive without useful frames in .stack but with a
// .componentStack (set by ReactFiberErrorDialog) that contains component
// locations with bundle offsets. Use componentStack as a fallback so
// eventFromException can extract frames with source locations.
// oxlint-disable-next-line typescript-eslint(no-unsafe-member-access)
if (error?.componentStack && (!error.stack || !hasStackFrames(error.stack))) {
// oxlint-disable-next-line typescript-eslint(no-unsafe-member-access)
error.stack = `${error.message || 'Error'}${error.componentStack}`;
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't we add an extra space between the parameters, so Error is not clued to the componentStack message?

}

const hint: EventHint = {
originalException: error,
attachments: getCurrentScope().getScopeData().attachments,
Expand Down Expand Up @@ -211,3 +221,10 @@ function setupErrorUtilsGlobalHandler(): void {
);
});
}

/**
* Checks if a stack trace string contains at least one frame line.
*/
function hasStackFrames(stack: unknown): boolean {
return typeof stack === 'string' && stack.includes('\n');
}
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hasStackFrames newline check too permissive for edge cases

Low Severity

hasStackFrames uses stack.includes('\n') to detect frame lines, but a multi-line error message without any actual frames (e.g., "Error: something\nMore details") would also pass this check, preventing the componentStack fallback from being applied. Checking for a frame-like pattern (e.g., \n at or \n in ) would be more reliable.

Fix in Cursor Fix in Web

Reviewed by Cursor Bugbot for commit f5e7ddd. Configure here.

Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,62 @@ describe('ReactNativeErrorHandlers', () => {

expect(hint).toEqual(expect.objectContaining({ originalException: new Error('Test Error') }));
});

test('Uses componentStack as fallback when error has no stack', async () => {
const integration = reactNativeErrorHandlersIntegration();
integration.setupOnce!();

const error: any = {
message: 'Value is undefined, expected an Object',
componentStack:
'\n at UserMessage (http://localhost:8081/index.bundle:1:5274251)' +
'\n at renderItem (http://localhost:8081/index.bundle:1:5280705)',
};

await errorHandlerCallback!(error, true);
await client.flush();

expect(error.stack).toBe(
'Value is undefined, expected an Object' +
'\n at UserMessage (http://localhost:8081/index.bundle:1:5274251)' +
'\n at renderItem (http://localhost:8081/index.bundle:1:5280705)',
);
});

test('Uses componentStack as fallback when stack has no frames', async () => {
const integration = reactNativeErrorHandlersIntegration();
integration.setupOnce!();

const error: any = {
message: 'Value is undefined, expected an Object',
stack: 'Error: Value is undefined, expected an Object',
componentStack:
'\n at UserMessage (http://localhost:8081/index.bundle:1:5274251)' +
'\n at renderItem (http://localhost:8081/index.bundle:1:5280705)',
};

await errorHandlerCallback!(error, true);
await client.flush();

expect(error.stack).toBe(
'Value is undefined, expected an Object' +
'\n at UserMessage (http://localhost:8081/index.bundle:1:5274251)' +
'\n at renderItem (http://localhost:8081/index.bundle:1:5280705)',
);
});

test('Does not override stack when error already has frames', async () => {
const integration = reactNativeErrorHandlersIntegration();
integration.setupOnce!();

const error = new Error('Test Error');
(error as any).componentStack = '\n at SomeComponent (http://localhost:8081/index.bundle:1:100)';
const originalStack = error.stack;

await errorHandlerCallback!(error, false);

expect(error.stack).toBe(originalStack);
});
});

describe('onUnhandledRejection', () => {
Expand Down
Loading