diff options
| author | Fedor Indutny <fedor.indutny@gmail.com> | 2014-03-02 23:54:19 +0400 |
|---|---|---|
| committer | Fedor Indutny <fedor.indutny@gmail.com> | 2014-03-02 23:54:19 +0400 |
| commit | 78d245f5b21eede58e79138330690d63cf3d86f8 (patch) | |
| tree | 205a01d5009031b21706d5d0780099bba927a42c /lib/assert.js | |
| parent | 34bf6e46beb4b94e9ed3c51da8589d604f19bc4e (diff) | |
| parent | 47abdd9c43ae97ed11cb8cc4c770b43043718308 (diff) | |
| download | nodejs-78d245f5b21eede58e79138330690d63cf3d86f8.tar.gz nodejs-78d245f5b21eede58e79138330690d63cf3d86f8.tar.bz2 nodejs-78d245f5b21eede58e79138330690d63cf3d86f8.zip | |
Merge remote-tracking branch 'origin/v0.10'
Conflicts:
configure
lib/_stream_readable.js
lib/http.js
src/node_dtrace.cc
Diffstat (limited to 'lib/assert.js')
| -rw-r--r-- | lib/assert.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/assert.js b/lib/assert.js index 5e9f78f9e..7602996c9 100644 --- a/lib/assert.js +++ b/lib/assert.js @@ -201,10 +201,11 @@ function objEquiv(a, b) { if (a.prototype !== b.prototype) return false; //~~~I've managed to break Object.keys through screwy arguments passing. // Converting to array solves the problem. - if (isArguments(a)) { - if (!isArguments(b)) { - return false; - } + var aIsArgs = isArguments(a), + bIsArgs = isArguments(b); + if ((aIsArgs && !bIsArgs) || (!aIsArgs && bIsArgs)) + return false; + if (aIsArgs) { a = pSlice.call(a); b = pSlice.call(b); return _deepEqual(a, b); |