1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

util: make util.inspect() work when "hasOwnProperty" is overwritten

Browse Source
This commit is contained in:
Nathan Rajlich 2012-09-08 15:09:59 -07:00
parent 9a3521cb25
commit fb383a0ad0
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/util.js
View File

@ -318,7 +318,7 @@ function formatError(value) {
function formatArray(ctx, value, recurseTimes, visibleKeys, keys) { function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
var output = []; var output = [];
for (var i = 0, l = value.length; i < l; ++i) { for (var i = 0, l = value.length; i < l; ++i) {
if (Object.prototype.hasOwnProperty.call(value, String(i))) { if (hasOwnProperty(value, String(i))) {
output.push(formatProperty(ctx, value, recurseTimes, visibleKeys, output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
String(i), true)); String(i), true));
} else { } else {
@ -349,7 +349,7 @@ function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
str = ctx.stylize('[Setter]', 'special'); str = ctx.stylize('[Setter]', 'special');
} }
} }
if (!visibleKeys.hasOwnProperty(key)) { if (!hasOwnProperty(visibleKeys, key)) {
name = '[' + key + ']'; name = '[' + key + ']';
} }
if (!str) { if (!str) {
@ -556,3 +556,7 @@ exports._extend = function(origin, add) {
} }
return origin; return origin;
}; };
function hasOwnProperty(obj, prop) {
return Object.prototype.hasOwnProperty.call(obj, prop);
}

7
test/simple/test-util-inspect.js
View File

@ -107,3 +107,10 @@ assert.doesNotThrow(function() {
// GH-2225 // GH-2225
var x = { inspect: util.inspect }; var x = { inspect: util.inspect };
assert.ok(util.inspect(x).indexOf('inspect') != -1); assert.ok(util.inspect(x).indexOf('inspect') != -1);
// an object with "hasOwnProperty" overwritten should not throw
assert.doesNotThrow(function() {
util.inspect({
hasOwnProperty: null
});
});