worker: fix process.env var empty key access

bl-ue · BethGriggs · commit c84d802449f8 · 2020-04-28T23:00:40.000+01:00
PR-URL: #32921 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Franziska Hinkelmann <franziska.hinkelmann@gmail.com> Reviewed-By: Zeyu Yang <himself65@outlook.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
diff --git a/src/node_env_var.cc b/src/node_env_var.cc
@@ -227,7 +227,7 @@ void MapKVStore::Set(Isolate* isolate, Local<String> key, Local<String> value) {
   Mutex::ScopedLock lock(mutex_);
   Utf8Value key_str(isolate, key);
   Utf8Value value_str(isolate, value);
-  if (*key_str != nullptr && *value_str != nullptr) {
+  if (*key_str != nullptr && key_str.length() > 0 && *value_str != nullptr) {
     map_[std::string(*key_str, key_str.length())] =
         std::string(*value_str, value_str.length());
   }

Original file line number	Diff line number	Diff line change
`@@ -227,7 +227,7 @@ void MapKVStore::Set(Isolate* isolate, Local<String> key, Local<String> value) {`
`227`	`227`	`Mutex::ScopedLock lock(mutex_);`
`228`	`228`	`Utf8Value key_str(isolate, key);`
`229`	`229`	`Utf8Value value_str(isolate, value);`
`230`		`- if (key_str != nullptr && value_str != nullptr) {`
	`230`	`+ if (key_str != nullptr && key_str.length() > 0 && value_str != nullptr) {`
`231`	`231`	`map_[std::string(*key_str, key_str.length())] =`
`232`	`232`	`std::string(*value_str, value_str.length());`
`233`	`233`	`}`