Skip to content

Commit

Permalink
fix(browser): Ensure wrap() only returns functions (getsentry#13838)
Browse files Browse the repository at this point in the history
  • Loading branch information
lforst authored and legobeat committed Oct 3, 2024
1 parent 5adcbf9 commit 66cf611
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
8 changes: 7 additions & 1 deletion packages/browser/src/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,13 @@ export function wrap(
// the original wrapper.
const wrapper = fn.__sentry_wrapped__;
if (wrapper) {
return wrapper;
if (typeof wrapper === 'function') {
return wrapper;
} else {
// If we find that the `__sentry_wrapped__` function is not a function at the time of accessing it, it means
// that something messed with it. In that case we want to return the originally passed function.
return fn;
}
}

// We don't wanna wrap it twice
Expand Down
13 changes: 13 additions & 0 deletions packages/browser/test/unit/integrations/helpers.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -174,4 +174,17 @@ describe('internal wrap()', () => {
expect(wrapped.__sentry_original__).toBe(fn);
expect(fn.__sentry_wrapped__).toBe(wrapped);
});

it('should only return __sentry_wrapped__ when it is a function', () => {
const fn = (() => 1337) as WrappedFunction;

wrap(fn);
expect(fn).toHaveProperty('__sentry_wrapped__');
fn.__sentry_wrapped__ = 'something that is not a function' as any;

const wrapped = wrap(fn);

expect(wrapped).toBe(fn);
expect(wrapped).not.toBe('something that is not a function');
});
});

0 comments on commit 66cf611

Please sign in to comment.