dont clone in merge, closes #29

Author: nlf

lib/utils.js

@@ -49,25 +49,23 @@ exports.merge = function (target, source) {
         return target;
     }
 
-    var obj = exports.clone(target);
-
     if (Array.isArray(source)) {
         for (var i = 0, il = source.length; i < il; ++i) {
             if (typeof source[i] !== 'undefined') {
-                if (typeof obj[i] === 'object') {
-                    obj[i] = exports.merge(obj[i], source[i]);
+                if (typeof target[i] === 'object') {
+                    target[i] = exports.merge(target[i], source[i]);
                 }
                 else {
-                    obj[i] = source[i];
+                    target[i] = source[i];
                 }
             }
         }
 
-        return obj;
+        return target;
     }
 
-    if (Array.isArray(obj)) {
-        obj = exports.arrayToObject(obj);
+    if (Array.isArray(target)) {
+        target = exports.arrayToObject(target);
     }
 
     var keys = Object.keys(source);
@@ -78,19 +76,19 @@ exports.merge = function (target, source) {
         if (value &&
             typeof value === 'object') {
 
-            if (!obj[key]) {
-                obj[key] = exports.clone(value);
+            if (!target[key]) {
+                target[key] = exports.clone(value);
             }
             else {
-                obj[key] = exports.merge(obj[key], value);
+                target[key] = exports.merge(target[key], value);
             }
         }
         else {
-            obj[key] = value;
+            target[key] = value;
         }
     }
 
-    return obj;
+    return target;
 };
 
 

test/stringify.js

@@ -126,4 +126,13 @@ describe('#stringify', function () {
         expect(Qs.stringify({ a: 'b', c: 'd' }, { delimiter: ';' })).to.equal('a=b;c=d');
         done();
     });
+
+    it('doesn\'t blow up when Buffer global is missing', function (done) {
+
+        var tempBuffer = global.Buffer;
+        delete global.Buffer;
+        expect(Qs.stringify({ a: 'b', c: 'd' })).to.equal('a=b&c=d');
+        global.Buffer = tempBuffer;
+        done();
+    });
 });