Cherry pick PR youtube#3939: Print an error message and return instea…

…d of crash (youtube#3954) Refer to the original PR: youtube#3939 When the address of a symbol couldn't be found, the app should return instead of crash. The address is validated by the caller, which returns false if address is NULL. Eventually the loader gets the error message, and reverts back to the previous good image. b/357947368 Change-Id: I74b9aa600c281a74ef817af0cd97f0cda4ab91cd Co-authored-by: yuying-y <[email protected]>
kaidokert · Aug 8, 2024 · dd5cf56 · dd5cf56
1 parent 06a21b3
commit dd5cf56
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/starboard/elf_loader/exported_symbols.cc b/starboard/elf_loader/exported_symbols.cc
@@ -434,7 +434,9 @@ const void* ExportedSymbols::Lookup(const char* name) {
   const void* address = map_[name];
   // Any symbol that is not registered as part of the Starboard API in the
   // constructor of this class is a leak, and is an error.
-  SB_CHECK(address) << "Failed to retrieve the address of '" << name << "'.";
+  if (!address) {
+    SB_LOG(ERROR) << "Failed to retrieve the address of '" << name << "'.";
+  }
   return address;
 }
 

diff --git a/starboard/elf_loader/exported_symbols.h b/starboard/elf_loader/exported_symbols.h
@@ -29,6 +29,7 @@ namespace elf_loader {
 class ExportedSymbols {
  public:
   ExportedSymbols();
+  // Returns the address of the symbol |name|. If it's not found, returns NULL.
   const void* Lookup(const char* name);
 
  private: