Merge pull request #1 from victornpb/fix-prototype-pullution

Fix prototype pullution

Author: victornpb

asciitable.js

@@ -39,13 +39,19 @@ function matrixToAsciiTable(m, options) {
     }, options);
 
 
-    function defaults(c, b) {
-        for (var a in b) {
-            b.hasOwnProperty(a) && (c[a] && typeof b[a] === "object" ? defaults(c[a], b[a]) : c[a] = b[a]);
-        }
-        return c;
+    function defaults(defaultObj, options) {
+        var isObj = function (x) { return x !== null && typeof x === "object"; };
+        if(isObj(options))
+            for (var prop in defaultObj) {
+                if (Object.prototype.hasOwnProperty.call(defaultObj, prop) && Object.prototype.hasOwnProperty.call(options, prop)) {
+                    if (isObj(defaultObj[prop])) defaults(defaultObj[prop], options[prop])
+                    else defaultObj[prop] = options[prop];
+                }
+            }
+        return defaultObj;
     }
 
+
     function repeatStr(width, str) {
         str = str || " ";
         var result = (width > 0) ? Array(Math.ceil(width / str.length) + 1).join(str) : "";

asciitable.min.js

@@ -45,13 +45,19 @@
         }, options);
 
 
-        function defaults(c, b) {
-            for (var a in b) {
-                b.hasOwnProperty(a) && (c[a] && typeof b[a] === "object" ? defaults(c[a], b[a]) : c[a] = b[a]);
-            }
-            return c;
+        function defaults(defaultObj, options) {
+            var isObj = function (x) { return x !== null && typeof x === "object"; };
+            if(isObj(options))
+                for (var prop in defaultObj) {
+                    if (Object.prototype.hasOwnProperty.call(defaultObj, prop) && Object.prototype.hasOwnProperty.call(options, prop)) {
+                        if (isObj(defaultObj[prop])) defaults(defaultObj[prop], options[prop])
+                        else defaultObj[prop] = options[prop];
+                    }
+                }
+            return defaultObj;
         }
 
+
         function repeatStr(width, str) {
             str = str || " ";
             var result = (width > 0) ? Array(Math.ceil(width / str.length) + 1).join(str) : "";
@@ -115,6 +121,6 @@
         }
         return table.join(options.row.lineBreak);
     }
-
+    
     return matrixToAsciiTable;
 }));