From 10f1c4c9e3028d797bea2675b56cecced1193824 Mon Sep 17 00:00:00 2001 From: cadorn Date: Wed, 6 Jun 2012 15:46:23 -0700 Subject: [PATCH 1/3] session reaping fix --- plugins-server/cloud9.session.file/session-ext.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins-server/cloud9.session.file/session-ext.js b/plugins-server/cloud9.session.file/session-ext.js index 0101d7fc9ea..a957bb75f4d 100644 --- a/plugins-server/cloud9.session.file/session-ext.js +++ b/plugins-server/cloud9.session.file/session-ext.js @@ -48,7 +48,13 @@ var FileStore = function(options) { console.error(err); return; } - var sess = JSON.parse(data); + var sess; + try { + sess = JSON.parse(data); + } catch(err) { + console.warn("Error '" + err + "' while reading session from file: " + self.basePath + "/" + file); + return; + } var expires = (typeof sess.cookie.expires === 'string') ? new Date(sess.cookie.expires) : sess.cookie.expires; From 807d85bb82a8d1936eb646ffb48a40e9bbc18699 Mon Sep 17 00:00:00 2001 From: cadorn Date: Wed, 6 Jun 2012 15:50:50 -0700 Subject: [PATCH 2/3] session reaping fix --- plugins-server/cloud9.session.file/session-ext.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins-server/cloud9.session.file/session-ext.js b/plugins-server/cloud9.session.file/session-ext.js index a957bb75f4d..2e71ed2f4ed 100644 --- a/plugins-server/cloud9.session.file/session-ext.js +++ b/plugins-server/cloud9.session.file/session-ext.js @@ -48,6 +48,10 @@ var FileStore = function(options) { console.error(err); return; } + if (data === "") { + self.destroy(file); + return; + } var sess; try { sess = JSON.parse(data); From b9249266e7d04c12f0c9214ac0e7c95c6fa97dc3 Mon Sep 17 00:00:00 2001 From: cadorn Date: Wed, 6 Jun 2012 15:53:19 -0700 Subject: [PATCH 3/3] session reaping fix --- plugins-server/cloud9.session.file/session-ext.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins-server/cloud9.session.file/session-ext.js b/plugins-server/cloud9.session.file/session-ext.js index 2e71ed2f4ed..aea535801f9 100644 --- a/plugins-server/cloud9.session.file/session-ext.js +++ b/plugins-server/cloud9.session.file/session-ext.js @@ -48,7 +48,7 @@ var FileStore = function(options) { console.error(err); return; } - if (data === "") { + if (data.toString() === "") { self.destroy(file); return; }