process: throw a TypeError when anything but an Array is passed to hr…

…time() Fixes #3664.
nodejs · Jul 9, 2012 · d3d83d7 · d3d83d7
1 parent 26f1bc8
commit d3d83d7
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 0 deletions.
diff --git a/src/node.cc b/src/node.cc
@@ -1690,6 +1690,11 @@ Handle<Value> Hrtime(const v8::Arguments& args) {
 
   if (args.Length() > 0) {
     // return a time diff tuple
+    if (!args[0]->IsArray()) {
+      Local<Value> exception = Exception::TypeError(
+          String::New("process.hrtime() only accepts an Array tuple."));
+      return ThrowException(exception);
+    }
     Local<Array> inArray = Local<Array>::Cast(args[0]);
     uint64_t seconds = inArray->Get(0)->Uint32Value();
     uint64_t nanos = inArray->Get(1)->Uint32Value();

diff --git a/test/simple/test-process-hrtime.js b/test/simple/test-process-hrtime.js
@@ -0,0 +1,46 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+var common = require('../common');
+var assert = require('assert');
+
+// the default behavior, return an Array "tuple" of numbers
+var tuple = process.hrtime();
+
+// validate the default behavior
+validateTuple(tuple);
+
+// validate that passing an existing tuple returns another valid tuple
+validateTuple(process.hrtime(tuple));
+
+// test that only an Array may be passed to process.hrtime()
+assert.throws(function() {
+  process.hrtime(1);
+});
+
+function validateTuple(tuple) {
+  assert(Array.isArray(tuple));
+  assert.equal(2, tuple.length);
+  tuple.forEach(function (v) {
+    assert.equal('number', typeof v);
+    assert(isFinite(v));
+  });
+}