From 31eef5c34da54908dfc4c888d89ed6bd5c3aaee3 Mon Sep 17 00:00:00 2001
From: harriha <harri.halikka@gmail.com>
Date: Tue, 1 Sep 2015 22:37:59 +0300
Subject: [PATCH 1/3] Add some unit tests for clone()

---
 test/winston-test.js | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/test/winston-test.js b/test/winston-test.js
index 5dec373d4..30e72c115 100644
--- a/test/winston-test.js
+++ b/test/winston-test.js
@@ -93,6 +93,36 @@ vows.describe('winston').addBatch({
             assert.isTrue(typeof winston[key] === 'undefined');
           });
       }
+    },
+    "the clone() method": {
+      "with Error object": {
+        topic: function () {
+          var original = new Error("foo");
+          original.name = "bar";
+
+          var copy = winston.clone(original);
+
+          return { original: original, copy: copy };
+        },
+        "should clone the value": function (result) {
+          assert.notEqual(result.original, result.copy);
+          assert.equal(result.original.message, result.copy.message);
+          assert.equal(result.original.name, result.copy.name);
+        }
+      },
+      "with Date object": {
+        topic: function () {
+          var original = new Date(1000);
+
+          var copy = winston.clone(original);
+
+          return { original: original, copy: copy };
+        },
+        "should clone the value": function (result) {
+          assert.notEqual(result.original, result.copy);
+          assert.equal(result.original.getTime(), result.copy.getTime());
+        }
+      }
     }
   }
 }).export(module);

From 79c921fca12b938675786b89077c81b241361b70 Mon Sep 17 00:00:00 2001
From: harriha <harri.halikka@gmail.com>
Date: Tue, 1 Sep 2015 22:46:35 +0300
Subject: [PATCH 2/3] Add tests for checking certain meta values in file
 transport

---
 test/transports/file-test.js | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/test/transports/file-test.js b/test/transports/file-test.js
index d5cb58cb1..e6f6b3a96 100644
--- a/test/transports/file-test.js
+++ b/test/transports/file-test.js
@@ -91,6 +91,42 @@ vows.describe('winston/transports/file').addBatch({
       assert.isTrue(true);
     }
   }
+}).addBatch({
+  "Error object in metadata #610": {
+    topic: function () {
+      var myErr = new Error("foo");
+
+      fileTransport.log('info', 'test message', myErr, this.callback.bind(this, null, myErr));
+    },
+    "should not be modified": function (err, myErr) {
+      assert.equal(myErr.message, "foo");
+      // Not sure if this is the best possible way to check if additional props appeared
+      assert.deepEqual(Object.getOwnPropertyNames(myErr), Object.getOwnPropertyNames(new Error("foo")));
+    }
+  }
+}).addBatch({
+  "Date object in metadata": {
+    topic: function () {
+      var obj = new Date(1000);
+
+      fileTransport.log('info', 'test message', obj, this.callback.bind(this, null, obj));
+    },
+    "should not be modified": function (err, obj) {
+      // Not sure if this is the best possible way to check if additional props appeared
+      assert.deepEqual(Object.getOwnPropertyNames(obj), Object.getOwnPropertyNames(new Date()));
+    }
+  }
+}).addBatch({
+  "Plain object in metadata": {
+    topic: function () {
+      var obj = { message: "foo" };
+
+      fileTransport.log('info', 'test message', obj, this.callback.bind(this, null, obj));
+    },
+    "should not be modified": function (err, obj) {
+      assert.deepEqual(obj, { message: "foo" });
+    }
+  }
 }).addBatch({
   "An instance of the File Transport": transport(winston.transports.File, {
     filename: path.join(__dirname, '..', 'fixtures', 'logs', 'testfile.log')

From 5dc96ae67ed46dbecc9e4b316fdb43b057c78574 Mon Sep 17 00:00:00 2001
From: harriha <harri.halikka@gmail.com>
Date: Tue, 1 Sep 2015 22:47:41 +0300
Subject: [PATCH 3/3] Clone Error and Date objects. Fixes #610

---
 lib/winston/common.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/winston/common.js b/lib/winston/common.js
index 7351b11cc..7ed5a4b18 100644
--- a/lib/winston/common.js
+++ b/lib/winston/common.js
@@ -80,17 +80,25 @@ exports.clone = function (obj) {
   //
   // We only need to clone reference types (Object)
   //
+  var copy = {};
+
   if (obj instanceof Error) {
-    return obj;
+    // With potential custom Error objects, this might not be exactly correct,
+    // but probably close-enough for purposes of this lib.
+    copy = new Error(obj.message);
+    for (var i in obj) {
+      copy[i] = obj[i];
+    }
+
+    return copy;
   }
   else if (!(obj instanceof Object)) {
     return obj;
   }
   else if (obj instanceof Date) {
-    return obj;
+    return new Date(obj.getTime());
   }
 
-  var copy = {};
   for (var i in obj) {
     if (Array.isArray(obj[i])) {
       copy[i] = obj[i].slice(0);