* Fixed ArrayBuffer.isView issue in IE10.

* Improved performance of input check.

.travis.yml

@@ -1,20 +1,10 @@
 language: node_js
 node_js:
-  - "0.12.15"
+  - "6.11.4"
-  - "4.5"
+  - "8.6.0"
-  - "6.5.0"
 before_install:
   - npm install coveralls
   - npm install mocha-lcov-reporter
-install:
-  - CXX="g++-4.8" CC="gcc-4.8" npm install
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - gcc-4.8
-    - g++-4.8
 script: npm run-script coveralls
 branches:
   only:

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## v0.6.1 / 2017-10-07
+### Fixed
+- ArrayBuffer.isView issue in IE10.
+
+### Improved
+- performance of input check.
+
 ## v0.6.0 / 2017-07-28
 ### Added
 - support base64 string output.

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "js-md5",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "main": ["src/md5.js"],
   "ignore": [
     "tests"

doc/Md5_.html

@@ -93,7 +93,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line172">line 172</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line178">line 178</a>
     </li></ul></dd>
     
 
@@ -206,7 +206,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line566">line 566</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line574">line 574</a>
     </li></ul></dd>
     
 
@@ -326,7 +326,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line578">line 578</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line586">line 586</a>
     </li></ul></dd>
     
 
@@ -446,7 +446,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line613">line 613</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line621">line 621</a>
     </li></ul></dd>
     
 
@@ -568,7 +568,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line600">line 600</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line608">line 608</a>
     </li></ul></dd>
     
 
@@ -688,7 +688,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line544">line 544</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line552">line 552</a>
     </li></ul></dd>
     
 
@@ -808,7 +808,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line499">line 499</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line507">line 507</a>
     </li></ul></dd>
     
 
@@ -928,7 +928,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line532">line 532</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line540">line 540</a>
     </li></ul></dd>
     
 
@@ -1106,7 +1106,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line200">line 200</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line206">line 206</a>
     </li></ul></dd>
     
 
@@ -1185,7 +1185,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a> on Fri Jul 28 2017 14:11:21 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sat Oct 07 2017 09:51:51 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/global.html

@@ -214,7 +214,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line646">line 646</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line654">line 654</a>
     </li></ul></dd>
     
 
@@ -300,7 +300,7 @@ md5(new Uint8Array([])); // d41d8cd98f00b204e9800998ecf8427e</code></pre>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a> on Fri Jul 28 2017 14:11:21 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sat Oct 07 2017 09:51:51 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/index.html

@@ -96,7 +96,7 @@ md5.base64(''); // 1B2M2Y8AsgTpgAmY7PhCfg==</code></pre><h2>License</h2><p>The p
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a> on Fri Jul 28 2017 14:11:21 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sat Oct 07 2017 09:51:51 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/md5.html

@@ -47,7 +47,7 @@
 
     
     <dt class="tag-version">Version:</dt>
-    <dd class="tag-version"><ul class="dummy"><li>0.6.0</li></ul></dd>
+    <dd class="tag-version"><ul class="dummy"><li>0.6.1</li></ul></dd>
     
 
     
@@ -237,7 +237,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line68">line 68</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line74">line 74</a>
     </li></ul></dd>
     
 
@@ -408,7 +408,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line77">line 77</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line83">line 83</a>
     </li></ul></dd>
     
 
@@ -579,7 +579,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line96">line 96</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line102">line 102</a>
     </li></ul></dd>
     
 
@@ -752,7 +752,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line86">line 86</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line92">line 92</a>
     </li></ul></dd>
     
 
@@ -865,7 +865,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line111">line 111</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line117">line 117</a>
     </li></ul></dd>
     
 
@@ -1036,7 +1036,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line59">line 59</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line65">line 65</a>
     </li></ul></dd>
     
 
@@ -1207,7 +1207,7 @@
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line48">line 48</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line54">line 54</a>
     </li></ul></dd>
     
 
@@ -1380,7 +1380,7 @@ md5('The quick brown fox jumps over the lazy dog');</code></pre>
     
     <dt class="tag-source">Source:</dt>
     <dd class="tag-source"><ul class="dummy"><li>
-        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line119">line 119</a>
+        <a href="md5.js.html">md5.js</a>, <a href="md5.js.html#line125">line 125</a>
     </li></ul></dd>
     
 
@@ -1460,7 +1460,7 @@ hash.update('The quick brown fox jumps over the lazy dog');</code></pre>
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a> on Fri Jul 28 2017 14:11:21 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sat Oct 07 2017 09:51:51 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>

doc/md5.js.html

@@ -30,7 +30,7 @@
  * [js-md5]{@link https://github.com/emn178/js-md5}
  *
  * @namespace md5
- * @version 0.6.0
+ * @version 0.6.1
  * @author Chen, Yi-Cyuan [emn178@gmail.com]
  * @copyright Chen, Yi-Cyuan 2014-2017
  * @license MIT
@@ -73,6 +73,12 @@
     };
   }
 
+  if (ARRAY_BUFFER && (root.JS_MD5_NO_ARRAY_BUFFER_IS_VIEW || !ArrayBuffer.isView)) {
+    ArrayBuffer.isView = function (obj) {
+      return typeof obj === 'object' && obj.buffer && obj.buffer.constructor === ArrayBuffer;
+    };
+  }
+
   /**
    * @method hex
    * @memberof md5
@@ -238,23 +244,25 @@
     if (this.finalized) {
       return;
     }
-    var notString = typeof(message) != 'string';
+
-    if (notString) {
+    var notString, type = typeof message;
-      if (message === null || message === undefined) {
+    if (type !== 'string') {
+      if (type === 'object') {
+        if (message === null) {
           throw ERROR;
-      } else if (message.constructor === root.ArrayBuffer) {
+        } else if (ARRAY_BUFFER && message.constructor === ArrayBuffer) {
           message = new Uint8Array(message);
-      }
+        } else if (!Array.isArray(message)) {
-    }
+          if (!ARRAY_BUFFER || !ArrayBuffer.isView(message)) {
-    var length = message.length;
-    if (notString) {
-      if (typeof length !== 'number' ||
-        !Array.isArray(message) && 
-        !(ARRAY_BUFFER && ArrayBuffer.isView(message))) {
             throw ERROR;
           }
         }
-    var code, index = 0, i, blocks = this.blocks;
+      } else {
+        throw ERROR;
+      }
+      notString = true;
+    }
+    var code, index = 0, i, length = message.length, blocks = this.blocks;
     var buffer8 = this.buffer8;
 
     while (index < length) {
@@ -712,7 +720,7 @@
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.3</a> on Fri Jul 28 2017 14:11:21 GMT+0800 (CST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Sat Oct 07 2017 09:51:51 GMT+0800 (CST)
 </footer>
 
 <script> prettyPrint(); </script>

package-lock.json

@@ -0,0 +1,500 @@
+{
+  "name": "js-md5",
+  "version": "0.6.1",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true
+    },
+    "async": {
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+      "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
+      "dev": true
+    },
+    "babylon": {
+      "version": "7.0.0-beta.19",
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz",
+      "integrity": "sha512-Vg0C9s/REX6/WIXN37UKpv5ZhRi6A4pjHlpkE34+8/a6c2W1Q692n3hmc+SZG5lKRnaExLUbxtJ1SVT+KaCQ/A==",
+      "dev": true
+    },
+    "bindings": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz",
+      "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==",
+      "dev": true
+    },
+    "bluebird": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
+      "dev": true
+    },
+    "camelcase": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+      "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=",
+      "dev": true
+    },
+    "catharsis": {
+      "version": "0.8.9",
+      "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.8.9.tgz",
+      "integrity": "sha1-mMyJDKZS3S7w5ws3klMQ/56Q/Is=",
+      "dev": true,
+      "requires": {
+        "underscore-contrib": "0.3.0"
+      }
+    },
+    "coffee-script": {
+      "version": "1.12.7",
+      "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz",
+      "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==",
+      "dev": true
+    },
+    "commander": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz",
+      "integrity": "sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=",
+      "dev": true
+    },
+    "debug": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.3.tgz",
+      "integrity": "sha1-/IxrLWACgEtAgcAgjg9kYLofo+Q=",
+      "dev": true,
+      "requires": {
+        "ms": "0.6.2"
+      }
+    },
+    "decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+      "dev": true
+    },
+    "diff": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz",
+      "integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=",
+      "dev": true
+    },
+    "ejs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/ejs/-/ejs-1.0.0.tgz",
+      "integrity": "sha1-ycYKSKRu5FL7MqccMXuV5aofyz0=",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "expect.js": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/expect.js/-/expect.js-0.3.1.tgz",
+      "integrity": "sha1-sKWaDS7/VDdUTr8M6qYBWEHQm1s=",
+      "dev": true
+    },
+    "glob": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz",
+      "integrity": "sha1-4xPusknHr/qlxHUoaw4RW1mDlGc=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "2.0.3",
+        "inherits": "2.0.3",
+        "minimatch": "0.2.14"
+      },
+      "dependencies": {
+        "graceful-fs": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz",
+          "integrity": "sha1-fNLNsiiko/Nule+mzBQt59GhNtA=",
+          "dev": true
+        }
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true
+    },
+    "growl": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/growl/-/growl-1.8.1.tgz",
+      "integrity": "sha1-Sy3sjZB+k9szZiTc7AGDUC+MlCg=",
+      "dev": true
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "jade": {
+      "version": "0.26.3",
+      "resolved": "https://registry.npmjs.org/jade/-/jade-0.26.3.tgz",
+      "integrity": "sha1-jxDXl32NefL2/4YqgbBRPMslaGw=",
+      "dev": true,
+      "requires": {
+        "commander": "0.6.1",
+        "mkdirp": "0.3.0"
+      },
+      "dependencies": {
+        "commander": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz",
+          "integrity": "sha1-+mihT2qUXVTbvlDYzbMyDp47GgY=",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.0.tgz",
+          "integrity": "sha1-G79asbqCevI1dRQ0kEJkVfSB/h4=",
+          "dev": true
+        }
+      }
+    },
+    "js2xmlparser": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-3.0.0.tgz",
+      "integrity": "sha1-P7YOqgicVED5MZ9RdgzNB+JJlzM=",
+      "dev": true,
+      "requires": {
+        "xmlcreate": "1.0.2"
+      }
+    },
+    "jscoverage": {
+      "version": "0.5.9",
+      "resolved": "https://registry.npmjs.org/jscoverage/-/jscoverage-0.5.9.tgz",
+      "integrity": "sha1-M3tR3ZBU6OyTwLCxU3VTtSvwst8=",
+      "dev": true,
+      "requires": {
+        "coffee-script": "1.12.7",
+        "debug": "1.0.3",
+        "ejs": "1.0.0",
+        "optimist": "0.3.1",
+        "uglify-js": "2.4.15",
+        "xfs": "0.1.8"
+      },
+      "dependencies": {
+        "uglify-js": {
+          "version": "2.4.15",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz",
+          "integrity": "sha1-ErxthDRfvDBuE/cHXWQ3qL9k1+M=",
+          "dev": true,
+          "requires": {
+            "async": "0.2.10",
+            "optimist": "0.3.7",
+            "source-map": "0.1.34",
+            "uglify-to-browserify": "1.0.2"
+          },
+          "dependencies": {
+            "optimist": {
+              "version": "0.3.7",
+              "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
+              "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
+              "dev": true,
+              "requires": {
+                "wordwrap": "0.0.3"
+              }
+            }
+          }
+        }
+      }
+    },
+    "jsdoc": {
+      "version": "3.5.5",
+      "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.5.5.tgz",
+      "integrity": "sha512-6PxB65TAU4WO0Wzyr/4/YhlGovXl0EVYfpKbpSroSj0qBxT4/xod/l40Opkm38dRHRdQgdeY836M0uVnJQG7kg==",
+      "dev": true,
+      "requires": {
+        "babylon": "7.0.0-beta.19",
+        "bluebird": "3.5.1",
+        "catharsis": "0.8.9",
+        "escape-string-regexp": "1.0.5",
+        "js2xmlparser": "3.0.0",
+        "klaw": "2.0.0",
+        "marked": "0.3.6",
+        "mkdirp": "0.5.1",
+        "requizzle": "0.2.1",
+        "strip-json-comments": "2.0.1",
+        "taffydb": "2.6.2",
+        "underscore": "1.8.3"
+      }
+    },
+    "klaw": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-2.0.0.tgz",
+      "integrity": "sha1-WcEo4Nxc5BAgEVEZTuucv4WGUPY=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
+    "lru-cache": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz",
+      "integrity": "sha1-bUUk6LlV+V1PW1iFHOId1y+06VI=",
+      "dev": true
+    },
+    "marked": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz",
+      "integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "0.2.14",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+      "integrity": "sha1-x054BXT2PG+aCQ6Q775u9TpqdWo=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "2.7.3",
+        "sigmund": "1.0.1"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "mocha": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-2.3.4.tgz",
+      "integrity": "sha1-himm+wRPLSJapLgaKuLQAWmesmY=",
+      "dev": true,
+      "requires": {
+        "commander": "2.3.0",
+        "debug": "2.2.0",
+        "diff": "1.4.0",
+        "escape-string-regexp": "1.0.2",
+        "glob": "3.2.3",
+        "growl": "1.8.1",
+        "jade": "0.26.3",
+        "mkdirp": "0.5.0",
+        "supports-color": "1.2.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "2.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz",
+          "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=",
+          "dev": true,
+          "requires": {
+            "ms": "0.7.1"
+          }
+        },
+        "escape-string-regexp": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.2.tgz",
+          "integrity": "sha1-Tbwv5nTnGUnK8/smlc5/LcHZqNE=",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+          "integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
+          "dev": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "0.7.1",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz",
+          "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=",
+          "dev": true
+        }
+      }
+    },
+    "ms": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz",
+      "integrity": "sha1-2JwhJMb9wTU9Zai3e/GqxLGTcIw=",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.7.0.tgz",
+      "integrity": "sha1-2Vv3IeyHfgjbJ27T/G63j5CDrUY=",
+      "dev": true
+    },
+    "optimist": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.1.tgz",
+      "integrity": "sha1-ZoDTBWAZOvWlXrZDlIg+17y5jy4=",
+      "dev": true,
+      "requires": {
+        "wordwrap": "0.0.3"
+      }
+    },
+    "requirejs": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/requirejs/-/requirejs-2.3.5.tgz",
+      "integrity": "sha512-svnO+aNcR/an9Dpi44C7KSAy5fFGLtmPbaaCeQaklUz8BQhS64tWWIIlvEA5jrWICzlO/X9KSzSeXFnZdBu8nw==",
+      "dev": true
+    },
+    "requizzle": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.1.tgz",
+      "integrity": "sha1-aUPDUwxNmn5G8c3dUcFY/GcM294=",
+      "dev": true,
+      "requires": {
+        "underscore": "1.6.0"
+      },
+      "dependencies": {
+        "underscore": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+          "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
+          "dev": true
+        }
+      }
+    },
+    "sigmund": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
+      "dev": true
+    },
+    "source-map": {
+      "version": "0.1.34",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.34.tgz",
+      "integrity": "sha1-p8/omux7FoLDsZjQrPtH19CQVms=",
+      "dev": true,
+      "requires": {
+        "amdefine": "1.0.1"
+      }
+    },
+    "strip-json-comments": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+      "dev": true
+    },
+    "supports-color": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.2.0.tgz",
+      "integrity": "sha1-/x7R5hFp0Gs88tWI4YixjYhH4X4=",
+      "dev": true
+    },
+    "taffydb": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/taffydb/-/taffydb-2.6.2.tgz",
+      "integrity": "sha1-fLy2S1oUG2ou/CxdLGe04VCyomg=",
+      "dev": true
+    },
+    "uglify-js": {
+      "version": "2.4.24",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.4.24.tgz",
+      "integrity": "sha1-+tV1XB4Vd2WLsG/5q25UjJW+vW4=",
+      "dev": true,
+      "requires": {
+        "async": "0.2.10",
+        "source-map": "0.1.34",
+        "uglify-to-browserify": "1.0.2",
+        "yargs": "3.5.4"
+      }
+    },
+    "uglify-to-browserify": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
+      "dev": true
+    },
+    "underscore": {
+      "version": "1.8.3",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+      "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=",
+      "dev": true
+    },
+    "underscore-contrib": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz",
+      "integrity": "sha1-ZltmwkeD+PorGMn4y7Dix9SMJsc=",
+      "dev": true,
+      "requires": {
+        "underscore": "1.6.0"
+      },
+      "dependencies": {
+        "underscore": {
+          "version": "1.6.0",
+          "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz",
+          "integrity": "sha1-izixDKze9jM3uLJOT/htRa6lKag=",
+          "dev": true
+        }
+      }
+    },
+    "webworker-threads": {
+      "version": "0.7.13",
+      "resolved": "https://registry.npmjs.org/webworker-threads/-/webworker-threads-0.7.13.tgz",
+      "integrity": "sha1-yEsYtrokElu503NC5E3rgVFi+4M=",
+      "dev": true,
+      "requires": {
+        "bindings": "1.3.0",
+        "nan": "2.7.0"
+      }
+    },
+    "window-size": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
+      "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=",
+      "dev": true
+    },
+    "wordwrap": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+      "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+      "dev": true
+    },
+    "xfs": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/xfs/-/xfs-0.1.8.tgz",
+      "integrity": "sha1-iHY8QtEdHvlWy9ZNnU2GunM1n9A=",
+      "dev": true
+    },
+    "xmlcreate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-1.0.2.tgz",
+      "integrity": "sha1-+mv3YqYKQT+z3Y9LA8WyaSONMI8=",
+      "dev": true
+    },
+    "yargs": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.5.4.tgz",
+      "integrity": "sha1-2K/49mXpTDS9JZvevRv68N3TU2E=",
+      "dev": true,
+      "requires": {
+        "camelcase": "1.2.1",
+        "decamelize": "1.2.0",
+        "window-size": "0.1.0",
+        "wordwrap": "0.0.2"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz",
+          "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=",
+          "dev": true
+        }
+      }
+    }
+  }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "js-md5",
-  "version": "0.6.0",
+  "version": "0.6.1",
   "description": "A simple MD5 hash function for JavaScript supports UTF-8 encoding.",
   "main": "src/md5.js",
   "devDependencies": {

src/md5.js

@@ -2,7 +2,7 @@
  * [js-md5]{@link https://github.com/emn178/js-md5}
  *
  * @namespace md5
- * @version 0.6.0
+ * @version 0.6.1
  * @author Chen, Yi-Cyuan [emn178@gmail.com]
  * @copyright Chen, Yi-Cyuan 2014-2017
  * @license MIT
@@ -45,6 +45,12 @@
     };
   }
 
+  if (ARRAY_BUFFER && (root.JS_MD5_NO_ARRAY_BUFFER_IS_VIEW || !ArrayBuffer.isView)) {
+    ArrayBuffer.isView = function (obj) {
+      return typeof obj === 'object' && obj.buffer && obj.buffer.constructor === ArrayBuffer;
+    };
+  }
+
   /**
    * @method hex
    * @memberof md5
@@ -210,23 +216,25 @@
     if (this.finalized) {
       return;
     }
-    var notString = typeof(message) != 'string';
+
-    if (notString) {
+    var notString, type = typeof message;
-      if (message === null || message === undefined) {
+    if (type !== 'string') {
+      if (type === 'object') {
+        if (message === null) {
           throw ERROR;
-      } else if (message.constructor === root.ArrayBuffer) {
+        } else if (ARRAY_BUFFER && message.constructor === ArrayBuffer) {
           message = new Uint8Array(message);
-      }
+        } else if (!Array.isArray(message)) {
-    }
+          if (!ARRAY_BUFFER || !ArrayBuffer.isView(message)) {
-    var length = message.length;
-    if (notString) {
-      if (typeof length !== 'number' ||
-        !Array.isArray(message) && 
-        !(ARRAY_BUFFER && ArrayBuffer.isView(message))) {
             throw ERROR;
           }
         }
-    var code, index = 0, i, blocks = this.blocks;
+      } else {
+        throw ERROR;
+      }
+      notString = true;
+    }
+    var code, index = 0, i, length = message.length, blocks = this.blocks;
     var buffer8 = this.buffer8;
 
     while (index < length) {

tests/node-test.js

@@ -1,56 +1,60 @@
 expect = require('expect.js');
 Worker = require('webworker-threads').Worker;
 
+function unset() {
+  delete require.cache[require.resolve('../src/md5.js')];
+  delete require.cache[require.resolve('./test.js')];
+  md5 = null;
+  BUFFER = undefined;
+  JS_MD5_NO_WINDOW = undefined;
+  JS_MD5_NO_NODE_JS = undefined;
+  JS_MD5_NO_COMMON_JS = undefined;
+  JS_MD5_NO_ARRAY_BUFFER = undefined;
+  JS_MD5_NO_ARRAY_BUFFER_IS_VIEW = undefined;
+  window = undefined;
+}
+
+function runCommonJsTest() {
+  md5 = require('../src/md5.js');
+  require('./test.js');
+  unset();
+}
+
+function runWindowTest() {
+  window = global;
+  require('../src/md5.js');
+  require('./test.js');
+  unset();
+}
+
 // Node.js env
 BUFFER = true;
-md5 = require('../src/md5.js');
+runCommonJsTest();
-require('./test.js');
-
-delete require.cache[require.resolve('../src/md5.js')]
-delete require.cache[require.resolve('./test.js')]
-md5 = null
 
 // Webpack browser env
 JS_MD5_NO_NODE_JS = true;
-BUFFER = false;
+runCommonJsTest();
-window = global;
-md5 = require('../src/md5.js');
-require('./test.js');
-
-delete require.cache[require.resolve('../src/md5.js')];
-delete require.cache[require.resolve('./test.js')];
-md5 = null;
 
 // browser env
 JS_MD5_NO_NODE_JS = true;
 JS_MD5_NO_COMMON_JS = true;
-BUFFER = false;
+runWindowTest();
-window = global;
-require('../src/md5.js');
-require('./test.js');
-
-delete require.cache[require.resolve('../src/md5.js')];
-delete require.cache[require.resolve('./test.js')];
-md5 = null;
 
 // browser env and no array buffer
 JS_MD5_NO_NODE_JS = true;
 JS_MD5_NO_COMMON_JS = true;
 JS_MD5_NO_ARRAY_BUFFER = true;
-BUFFER = false;
+runWindowTest();
-window = global;
-require('../src/md5.js');
-require('./test.js');
 
-delete require.cache[require.resolve('../src/md5.js')];
+// browser env and no isView
-delete require.cache[require.resolve('./test.js')];
+JS_MD5_NO_NODE_JS = true;
-md5 = null;
+JS_MD5_NO_COMMON_JS = true;
+JS_MD5_NO_ARRAY_BUFFER_IS_VIEW = true;
+runWindowTest();
 
 // browser AMD
 JS_MD5_NO_NODE_JS = true;
 JS_MD5_NO_COMMON_JS = true;
-JS_MD5_NO_ARRAY_BUFFER = false;
-BUFFER = false;
 window = global;
 define = function (func) {
   md5 = func();
@@ -59,10 +63,7 @@ define = function (func) {
 define.amd = true;
 
 require('../src/md5.js');
-
+unset();
-delete require.cache[require.resolve('../src/md5.js')];
-delete require.cache[require.resolve('./test.js')];
-md5 = null;
 
 // webworker
 WORKER = 'tests/worker.js';
@@ -75,9 +76,6 @@ delete require.cache[require.resolve('./worker-test.js')];
 // cover webworker
 JS_MD5_NO_WINDOW = true;
 JS_MD5_NO_NODE_JS = true;
-JS_MD5_NO_COMMON_JS = false;
-JS_MD5_NO_ARRAY_BUFFER = false;
-BUFFER = false;
 WORKER = './worker.js';
 SOURCE = '../src/md5.js';
 window = global;