Skip to content

Ensure globals are functions before running instanceof checks #4

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

Merged
darrachequesne merged 2 commits into from
Mar 1, 2017
Merged

Ensure globals are functions before running instanceof checks #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3b3567b
Ensure globals are functions before running `instanceof` checks again…
sgress454 Feb 24, 2017
27a4872
Merge branch 'master' of github.com:socketio/has-binary into fix/globals
darrachequesne Mar 1, 2017
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
8 changes: 4 additions & 4 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ function hasBinary (obj) {
return false;
}

if ((global.Buffer && global.Buffer.isBuffer && global.Buffer.isBuffer(obj)) ||
(global.ArrayBuffer && obj instanceof ArrayBuffer) ||
(global.Blob && obj instanceof Blob) ||
(global.File && obj instanceof File)
if ((typeof global.Buffer === 'function' && global.Buffer.isBuffer && global.Buffer.isBuffer(obj)) ||
(typeof global.ArrayBuffer === 'function' && obj instanceof ArrayBuffer) ||
(typeof global.Blob === 'function' && obj instanceof Blob) ||
(typeof global.File === 'function' && obj instanceof File)
) {
return true;
}
Expand Down
5 changes: 5 additions & 0 deletions test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,10 @@ describe('has-binarydata', function () {
it('should work with a Blob', function () {
assert(hasBinary(new Blob()));
});
} else {
it('should not crash if global Blob is not a function', function () {
global.Blob = [ 1, 2, 3 ];
assert(!hasBinary(global.Blob));
});
}
});