[Pkg-owncloud-commits] [owncloud] 05/79: tests for _parseTime with hex and empty strings

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 42ca905d62fc3c82b3b9931a7facd30b1357ebb5
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Jul 28 14:20:55 2015 +0200

    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 f767da1..99fd08c 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 a8beb80..3dc2513 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]);
 			});

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git