fs: validate fd on fs.write

PR-URL: #1553 PORT-PR-URL: #1560 PORT-FROM: v2.x / f9c681c Reviewed-By: Colin Ihrig <[email protected]>
nodejs · May 14, 2015 · 4030545 · 4030545
1 parent 898d423
commit 4030545
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/node_file.cc b/src/node_file.cc
@@ -779,7 +779,9 @@ static void Open(const FunctionCallbackInfo<Value>& args) {
 static void WriteBuffer(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
 
-  CHECK(args[0]->IsInt32());
+  if (!args[0]->IsInt32())
+    return env->ThrowTypeError("First argument must be file descriptor");
+
   CHECK(Buffer::HasInstance(args[1]));
 
   int fd = args[0]->Int32Value();

diff --git a/test/parallel/test-fs-write-no-fd.js b/test/parallel/test-fs-write-no-fd.js
@@ -0,0 +1,11 @@
+const common = require('../common');
+const fs = require('fs');
+const assert = require('assert');
+
+assert.throws(function() {
+  fs.write(null, new Buffer(1), 0, 1);
+}, /TypeError/);
+
+assert.throws(function() {
+  fs.write(null, '1', 0, 1);
+}, /TypeError/);