Permalink
Browse files

src: detect nul bytes in InternalModuleReadFile()

Throw an exception when the path contains nul bytes, don't abort.

Fixes: #13787
PR-URL: #14854
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
  • Loading branch information...
bnoordhuis authored and MylesBorins committed Aug 16, 2017
1 parent 7245082 commit b2112f8d36c6199f9243365462ba86256f764b27
Showing with 12 additions and 0 deletions.
  1. +3 −0 src/node_file.cc
  2. +9 −0 test/parallel/test-require-nul.js
View
@@ -571,6 +571,9 @@ static void InternalModuleReadFile(const FunctionCallbackInfo<Value>& args) {
CHECK(args[0]->IsString());
node::Utf8Value path(env->isolate(), args[0]);
if (strlen(*path) != path.length())
return; // Contains a nul byte.
uv_fs_t open_req;
const int fd = uv_fs_open(loop, &open_req, *path, O_RDONLY, 0, nullptr);
uv_fs_req_cleanup(&open_req);
@@ -0,0 +1,9 @@
'use strict';
require('../common');
const assert = require('assert');
// Nul bytes should throw, not abort.
assert.throws(() => require('\u0000ab'), /Cannot find module '\u0000ab'/);
assert.throws(() => require('a\u0000b'), /Cannot find module 'a\u0000b'/);
assert.throws(() => require('ab\u0000'), /Cannot find module 'ab\u0000'/);

0 comments on commit b2112f8

Please sign in to comment.