From 1540fc6a37e42fe002d3061a516431741e8e6d3d Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Tue, 8 Apr 2025 00:37:25 +0200
Subject: [PATCH] src: improve error handling in `node_env_var.cc`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PR-URL: https://github.com/nodejs/node/pull/57767
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
---
 src/node_env_var.cc | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/node_env_var.cc b/src/node_env_var.cc
index fe0896aaf5..307153c0e3 100644
--- a/src/node_env_var.cc
+++ b/src/node_env_var.cc
@@ -436,15 +436,14 @@ static Intercepted EnvGetter(Local<Name> property,
   MaybeLocal<String> value_string =
       env->env_vars()->Get(env->isolate(), property.As<String>());
 
-  bool has_env = !value_string.IsEmpty();
   TraceEnvVar(env, "get", property.As<String>());
 
-  if (has_env) {
-    // ToLocalChecked here is ok since we check IsEmpty above.
-    info.GetReturnValue().Set(value_string.ToLocalChecked());
-    return Intercepted::kYes;
+  Local<Value> ret;
+  if (!value_string.ToLocal(&ret)) {
+    return Intercepted::kNo;
   }
-  return Intercepted::kNo;
+  info.GetReturnValue().Set(ret);
+  return Intercepted::kYes;
 }
 
 static Intercepted EnvSetter(Local<Name> property,