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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@

- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott

## 7.119.1

- fix(browser/v7): Ensure wrap() only returns functions (#13838 backport)

Work in this release contributed by @legobeat. Thank you for your contribution!

## 7.119.0

- backport(tracing): Report dropped spans for transactions (#13343)
Expand Down
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');
});
});
Loading