src: don't match after -- in Dotenv::GetPathFromArgs

src/node_dotenv.cc

@@ -14,21 +14,23 @@ using v8::String;
 std::vector<std::string> Dotenv::GetPathFromArgs(
  const std::vector<std::string>& args) {
  const auto find_match = [](const std::string& arg) {
- const std::string_view flag = "--env-file";
- return strncmp(arg.c_str(), flag.data(), flag.size()) == 0;
+ return arg == "--" || arg.starts_with("--env-file");
  };
  std::vector<std::string> paths;
  auto path = std::find_if(args.begin(), args.end(), find_match);
 
  while (path != args.end()) {
+ if (*path == "--") {
+ return paths;
+ }
+
  auto equal_char = path->find('=');
 
  if (equal_char != std::string::npos) {
  paths.push_back(path->substr(equal_char + 1));
  } else {
  auto next_path = std::next(path);
-
- if (next_path == args.end()) {
+ if (next_path == args.end() || *next_path == "--") {
  return paths;
  }
 

test/parallel/should-not-write.txt

@@ -0,0 +1 @@
+hello

test/parallel/test-dotenv-edge-cases.js

@@ -98,4 +98,18 @@ describe('.env supports edge cases', () => {
  assert.strictEqual(child.stderr, '');
  assert.strictEqual(child.code, 0);
  });
+
+ it('should handle when --env-file is passed along with --', async () => {
+ const child = await common.spawnPromisified(
+ process.execPath,
+ [
+ '--eval', `require('assert').strictEqual(process.env.BASIC, undefined);`,
+ '--', '--env-file', validEnvFilePath
+ ],
+ { cwd: fixtures.path('dotenv') },
+ );
+ assert.strictEqual(child.stdout, '');
+ assert.strictEqual(child.stderr, '');
+ assert.strictEqual(child.code, 0);
+ });
 });