From eed87b1637d64340856bb7f77db899f5283ca84f Mon Sep 17 00:00:00 2001
From: Luca Maraschi <luca.maraschi@gmail.com>
Date: Fri, 17 Mar 2017 17:07:19 +0100
Subject: [PATCH] fs: (+/-)Infinity and NaN invalid unixtimestamp

Infinity and NaN are currently considered valid input when generating a
unix time stamp but are defaulted arbitrarly to Date.now()/1000. This
PR removes this behaviour and throw an exception like all the other
invalid input types.

PR-URL: https://github.com/nodejs/node/pull/11919
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 doc/api/fs.md                                    |  3 +--
 lib/fs.js                                        |  4 ++--
 test/parallel/test-fs-timestamp-parsing-error.js |  7 ++++---
 test/parallel/test-fs-utimes.js                  | 10 ++++------
 4 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/doc/api/fs.md b/doc/api/fs.md
index c6046d27313791..a527e9489672df 100644
--- a/doc/api/fs.md
+++ b/doc/api/fs.md
@@ -1880,8 +1880,7 @@ follow these rules:
   returns milliseconds, so it should be divided by 1000 before passing it in.
 - If the value is a numeric string like `'123456789'`, the value will get
   converted to the corresponding number.
-- If the value is `NaN` or `Infinity`, the value will get converted to
-  `Date.now() / 1000`.
+- If the value is `NaN`, `Infinity` or `-Infinity`, an Error will be thrown.
 
 ## fs.utimesSync(path, atime, mtime)
 <!-- YAML
diff --git a/lib/fs.js b/lib/fs.js
index 6487d39e4814d6..8c92db957b4663 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -1165,8 +1165,8 @@ function toUnixTimestamp(time) {
   if (typeof time === 'string' && +time == time) {
     return +time;
   }
-  if (typeof time === 'number') {
-    if (!Number.isFinite(time) || time < 0) {
+  if (Number.isFinite(time)) {
+    if (time < 0) {
       return Date.now() / 1000;
     }
     return time;
diff --git a/test/parallel/test-fs-timestamp-parsing-error.js b/test/parallel/test-fs-timestamp-parsing-error.js
index 321f80b269fa6f..42bbe45d511041 100644
--- a/test/parallel/test-fs-timestamp-parsing-error.js
+++ b/test/parallel/test-fs-timestamp-parsing-error.js
@@ -1,9 +1,9 @@
 'use strict';
 require('../common');
-const assert = require('assert');
 const fs = require('fs');
+const assert = require('assert');
 
-[undefined, null, []].forEach((input) => {
+[Infinity, -Infinity, NaN].forEach((input) => {
   assert.throws(() => fs._toUnixTimestamp(input),
                 new RegExp('^Error: Cannot parse time: ' + input + '$'));
 });
@@ -11,6 +11,7 @@ const fs = require('fs');
 assert.throws(() => fs._toUnixTimestamp({}),
               /^Error: Cannot parse time: \[object Object\]$/);
 
-[1, '1', Date.now(), -1, '-1', Infinity].forEach((input) => {
+const okInputs = [1, -1, '1', '-1', Date.now()];
+okInputs.forEach((input) => {
   assert.doesNotThrow(() => fs._toUnixTimestamp(input));
 });
diff --git a/test/parallel/test-fs-utimes.js b/test/parallel/test-fs-utimes.js
index 2d00d0eaed5847..456f09b8041cb6 100644
--- a/test/parallel/test-fs-utimes.js
+++ b/test/parallel/test-fs-utimes.js
@@ -143,17 +143,15 @@ function testIt(atime, mtime, callback) {
 const stats = fs.statSync(__filename);
 
 // run tests
-const runTest = common.mustCall(testIt, 6);
+const runTest = common.mustCall(testIt, 5);
 
 runTest(new Date('1982-09-10 13:37'), new Date('1982-09-10 13:37'), function() {
   runTest(new Date(), new Date(), function() {
     runTest(123456.789, 123456.789, function() {
       runTest(stats.mtime, stats.mtime, function() {
-        runTest(NaN, Infinity, function() {
-          runTest('123456', -1, common.mustCall(function() {
-            // done
-          }));
-        });
+        runTest('123456', -1, common.mustCall(function() {
+          // done
+        }));
       });
     });
   });