worker: fix worker name with \0

theanarkh · richardlau · commit c5a93a33557e · 2025-09-20T03:33:17.000Z
PR-URL: #59214 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Chengzhong Wu <legendecas@gmail.com>
diff --git a/src/api/environment.cc b/src/api/environment.cc
@@ -523,8 +523,19 @@ NODE_EXTERN std::unique_ptr<InspectorParentHandle> GetInspectorParentHandle(
 
 NODE_EXTERN std::unique_ptr<InspectorParentHandle> GetInspectorParentHandle(
     Environment* env, ThreadId thread_id, const char* url, const char* name) {
-  CHECK_NOT_NULL(env);
+  if (url == nullptr) url = "";
   if (name == nullptr) name = "";
+  std::string_view url_view(url);
+  std::string_view name_view(name);
+  return GetInspectorParentHandle(env, thread_id, url_view, name_view);
+}
+
+NODE_EXTERN std::unique_ptr<InspectorParentHandle> GetInspectorParentHandle(
+    Environment* env,
+    ThreadId thread_id,
+    std::string_view url,
+    std::string_view name) {
+  CHECK_NOT_NULL(env);
   CHECK_NE(thread_id.id, static_cast<uint64_t>(-1));
   if (!env->should_create_inspector()) {
     return nullptr;
diff --git a/src/inspector/worker_inspector.cc b/src/inspector/worker_inspector.cc
@@ -57,10 +57,10 @@ class WorkerFinishedRequest : public Request {
 
 ParentInspectorHandle::ParentInspectorHandle(
     uint64_t id,
-    const std::string& url,
+    std::string_view url,
     std::shared_ptr<MainThreadHandle> parent_thread,
     bool wait_for_connect,
-    const std::string& name,
+    std::string_view name,
     std::shared_ptr<NetworkResourceManager> network_resource_manager)
     : id_(id),
       url_(url),
@@ -104,8 +104,8 @@ void WorkerManager::WorkerStarted(uint64_t session_id,
 
 std::unique_ptr<ParentInspectorHandle> WorkerManager::NewParentHandle(
     uint64_t thread_id,
-    const std::string& url,
-    const std::string& name,
+    std::string_view url,
+    std::string_view name,
     std::shared_ptr<NetworkResourceManager> network_resource_manager) {
   bool wait = !delegates_waiting_on_start_.empty();
   return std::make_unique<ParentInspectorHandle>(
diff --git a/src/inspector/worker_inspector.h b/src/inspector/worker_inspector.h
@@ -57,14 +57,14 @@ class ParentInspectorHandle {
  public:
   ParentInspectorHandle(
       uint64_t id,
-      const std::string& url,
+      std::string_view url,
       std::shared_ptr<MainThreadHandle> parent_thread,
       bool wait_for_connect,
-      const std::string& name,
+      std::string_view name,
       std::shared_ptr<NetworkResourceManager> network_resource_manager);
   ~ParentInspectorHandle();
   std::unique_ptr<ParentInspectorHandle> NewParentInspectorHandle(
-      uint64_t thread_id, const std::string& url, const std::string& name) {
+      uint64_t thread_id, std::string_view url, std::string_view name) {
     return std::make_unique<ParentInspectorHandle>(
         thread_id, url, parent_thread_, wait_, name, network_resource_manager_);
   }
@@ -97,8 +97,8 @@ class WorkerManager : public std::enable_shared_from_this<WorkerManager> {
 
   std::unique_ptr<ParentInspectorHandle> NewParentHandle(
       uint64_t thread_id,
-      const std::string& url,
-      const std::string& name,
+      std::string_view url,
+      std::string_view name,
       std::shared_ptr<NetworkResourceManager> network_resource_manager);
   void WorkerStarted(uint64_t session_id, const WorkerInfo& info, bool waiting);
   void WorkerFinished(uint64_t session_id);
diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
@@ -1154,7 +1154,7 @@ void Agent::SetParentHandle(
 }
 
 std::unique_ptr<ParentInspectorHandle> Agent::GetParentHandle(
-    uint64_t thread_id, const std::string& url, const std::string& name) {
+    uint64_t thread_id, std::string_view url, std::string_view name) {
   THROW_IF_INSUFFICIENT_PERMISSIONS(parent_env_,
                                     permission::PermissionScope::kInspector,
                                     "GetParentHandle",
diff --git a/src/inspector_agent.h b/src/inspector_agent.h
@@ -94,8 +94,9 @@ class Agent {
   void DisableAsyncHook();
 
   void SetParentHandle(std::unique_ptr<ParentInspectorHandle> parent_handle);
-  std::unique_ptr<ParentInspectorHandle> GetParentHandle(
-      uint64_t thread_id, const std::string& url, const std::string& name);
+  std::unique_ptr<ParentInspectorHandle> GetParentHandle(uint64_t thread_id,
+                                                         std::string_view url,
+                                                         std::string_view name);
 
   // Called to create inspector sessions that can be used from the same thread.
   // The inspector responds by using the delegate to send messages back.
diff --git a/src/node.h b/src/node.h
@@ -744,6 +744,12 @@ NODE_EXTERN std::unique_ptr<InspectorParentHandle> GetInspectorParentHandle(
     const char* child_url,
     const char* name);
 
+NODE_EXTERN std::unique_ptr<InspectorParentHandle> GetInspectorParentHandle(
+    Environment* parent_env,
+    ThreadId child_thread_id,
+    std::string_view child_url,
+    std::string_view name);
+
 struct StartExecutionCallbackInfo {
   v8::Local<v8::Object> process_object;
   v8::Local<v8::Function> native_require;
diff --git a/src/node_worker.cc b/src/node_worker.cc
@@ -104,7 +104,7 @@ Worker::Worker(Environment* env,
   if (env->permission()->is_granted(
           env, node::permission::PermissionScope::kInspector)) {
     inspector_parent_handle_ =
-        GetInspectorParentHandle(env, thread_id_, url.c_str(), name.c_str());
+        GetInspectorParentHandle(env, thread_id_, url, name);
   }
 
   argv_ = std::vector<std::string>{env->argv()[0]};
diff --git a/test/parallel/test-worker-name.js b/test/parallel/test-worker-name.js
@@ -17,7 +17,7 @@ if (!isMainThread) {
 const assert = require('assert');
 
 if (isMainThread) {
-  const name = 'Hello Thread';
+  const name = 'Hello\0Thread';
   const expectedTitle = `[worker 1] ${name}`;
   const worker = new Worker(fixtures.path('worker-name.js'), {
     name,

Original file line number	Diff line number	Diff line change
`@@ -1154,7 +1154,7 @@ void Agent::SetParentHandle(`
`1154`	`1154`	`}`
`1155`	`1155`
`1156`	`1156`	`std::unique_ptr<ParentInspectorHandle> Agent::GetParentHandle(`
`1157`		`- uint64_t thread_id, const std::string& url, const std::string& name) {`
	`1157`	`+ uint64_t thread_id, std::string_view url, std::string_view name) {`
`1158`	`1158`	`THROW_IF_INSUFFICIENT_PERMISSIONS(parent_env_,`
`1159`	`1159`	`permission::PermissionScope::kInspector,`
`1160`	`1160`	`"GetParentHandle",`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ Worker::Worker(Environment* env,`
`104`	`104`	`if (env->permission()->is_granted(`
`105`	`105`	`env, node::permission::PermissionScope::kInspector)) {`
`106`	`106`	`inspector_parent_handle_ =`
`107`		`- GetInspectorParentHandle(env, thread_id_, url.c_str(), name.c_str());`
	`107`	`+ GetInspectorParentHandle(env, thread_id_, url, name);`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`argv_ = std::vector<std::string>{env->argv()[0]};`