From 5a0d41048868eddd709c6e9bb71a8c5243d239c0 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 28 Jul 2015 14:20:55 +0200
Subject: [PATCH] tests for _parseTime with hex and empty strings
---
core/js/share.js | 4 ++++
core/js/tests/specs/shareSpec.js | 2 ++
2 files changed, 6 insertions(+)
diff --git a/core/js/share.js b/core/js/share.js
index f767da18da..99fd08c641 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -827,6 +827,10 @@ OC.Share={
*/
_parseTime: function(time) {
if (_.isString(time)) {
+ // skip empty strings and hex values
+ if (time === '' || (time.length > 1 && time[0] === '0' && time[1] === 'x')) {
+ return null;
+ }
time = parseInt(time, 10);
if(isNaN(time)) {
time = null;
diff --git a/core/js/tests/specs/shareSpec.js b/core/js/tests/specs/shareSpec.js
index a8beb807cc..3dc25134f5 100644
--- a/core/js/tests/specs/shareSpec.js
+++ b/core/js/tests/specs/shareSpec.js
@@ -1324,6 +1324,8 @@ describe('OC.Share tests', function() {
[ 123456 , 123456],
['0123456', 123456],
['abcdefg', null],
+ ['0x12345', null],
+ [ '', null],
], function(value) {
expect(OC.Share._parseTime(value[0])).toEqual(value[1]);
});
--
GitLab