Skip to content

fix the case when toJSON() returns a Buffer #2

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

Closed
chatziko wants to merge 2 commits into from
Closed

fix the case when toJSON() returns a Buffer #2

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
0af96f6
add test for object whose toJSON() returns a Buffer
chatziko Jan 8, 2016
23ee175
fix the case when toJSON() returns Buffer
chatziko Jan 8, 2016
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
7 changes: 4 additions & 3 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ module.exports = hasBinary;

function hasBinary(data) {

function _hasBinary(obj) {
function _hasBinary(obj, afterToJSON) {
if (!obj) return false;

if ( (global.Buffer && global.Buffer.isBuffer && global.Buffer.isBuffer(obj)) ||
Expand All @@ -41,8 +41,9 @@ function hasBinary(data) {
}
} else if (obj && 'object' == typeof obj) {
// see: https://github.com/Automattic/has-binary/pull/4
if (obj.toJSON && 'function' == typeof obj.toJSON) {
obj = obj.toJSON();
// also: toJSON() can return any type. Restart the check, but don't call toJSON twice
if (!afterToJSON && obj.toJSON && 'function' == typeof obj.toJSON) {
return _hasBinary(obj.toJSON(), true);
}

for (var key in obj) {
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 @@ -29,6 +29,11 @@ describe('has-binarydata', function(){
assert(hasBinary(ob));
});

it('should work with an object whose toJSON() returns a buffer', function() {
var ob = {a: 'a', b: [], c: 1234, toJSON: function() { return new Buffer('abc') }};
assert(hasBinary(ob));
});

it('should work with null', function() {
assert(!hasBinary(null));
});
Expand Down