commit 34212e014a5bfa7c5988f96c45f0dfd6236f3728
author Alex Brachet <abrachet@google.com> Mon Jul 11 17:39:44 2022 +0000
committer Copybara-Service <copybara-worker@google.com> Mon Jul 11 10:46:07 2022 -0700
tree cc5c8cf61c21c172c8fbb13b04fdcbe1dbf98ebe
parent 2b22bfc9d0885794f2ac79a0edcd6b2b46608cd5

[scudo][Fuchsia] Don't assume MapPlatformData::Vmar is valid

After https://reviews.llvm.org/D129237, the assumption
that any non-null data contains a valid vmar handle is no
longer true. Generally this code here needs cleanup, but
in the meantime this fixes errors on Fuchsia.

Differential Revision: https://reviews.llvm.org/D129331

GitOrigin-RevId: c823cbf699e9324dc1448a46b11941fb3030f97d

fuchsia.cpp

diff --git a/fuchsia.cpp b/fuchsia.cpp
index 8ab2b38..9ec0f85 100644
--- a/fuchsia.cpp
+++ b/fuchsia.cpp
@@ -57,8 +57,7 @@
   if (Flags & MAP_NOACCESS)
     return allocateVmar(Size, Data, AllowNoMem);
 
-  const zx_handle_t Vmar = Data ? Data->Vmar : _zx_vmar_root_self();
-  CHECK_NE(Vmar, ZX_HANDLE_INVALID);
+  const zx_handle_t Vmar = (Data && Data->Vmar != ZX_HANDLE_INVALID) ? Data->Vmar : _zx_vmar_root_self();
 
   zx_status_t Status;
   zx_handle_t Vmo;
@@ -126,7 +125,7 @@
     CHECK_EQ(_zx_vmar_destroy(Vmar), ZX_OK);
     CHECK_EQ(_zx_handle_close(Vmar), ZX_OK);
   } else {
-    const zx_handle_t Vmar = Data ? Data->Vmar : _zx_vmar_root_self();
+    const zx_handle_t Vmar = (Data && Data->Vmar != ZX_HANDLE_INVALID) ? Data->Vmar : _zx_vmar_root_self();
     const zx_status_t Status =
         _zx_vmar_unmap(Vmar, reinterpret_cast<uintptr_t>(Addr), Size);
     if (UNLIKELY(Status != ZX_OK))