diff options
| -rw-r--r-- | compiler-rt/lib/interception/interception_win.cc | 2 | ||||
| -rw-r--r-- | compiler-rt/lib/interception/tests/interception_win_test.cc | 7 |
2 files changed, 9 insertions, 0 deletions
diff --git a/compiler-rt/lib/interception/interception_win.cc b/compiler-rt/lib/interception/interception_win.cc index 91abecf6de5..e4f3d358f40 100644 --- a/compiler-rt/lib/interception/interception_win.cc +++ b/compiler-rt/lib/interception/interception_win.cc @@ -878,6 +878,8 @@ uptr InternalGetProcAddress(void *module, const char *func_name) { IMAGE_DATA_DIRECTORY *export_directory = &headers->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT]; + if (export_directory->Size == 0) + return 0; RVAPtr<IMAGE_EXPORT_DIRECTORY> exports(module, export_directory->VirtualAddress); RVAPtr<DWORD> functions(module, exports->AddressOfFunctions); diff --git a/compiler-rt/lib/interception/tests/interception_win_test.cc b/compiler-rt/lib/interception/tests/interception_win_test.cc index 684ee030355..a705768d6d5 100644 --- a/compiler-rt/lib/interception/tests/interception_win_test.cc +++ b/compiler-rt/lib/interception/tests/interception_win_test.cc @@ -613,6 +613,13 @@ TEST(Interception, PatchableFunctionPadding) { EXPECT_FALSE(TestFunctionPatching(kUnpatchableCode6, override, prefix)); } +TEST(Interception, EmptyExportTable) { + // We try to get a pointer to a function from an executable that doesn't + // export any symbol (empty export table). + uptr FunPtr = InternalGetProcAddress((void *)GetModuleHandleA(0), "example"); + EXPECT_EQ(0U, FunPtr); +} + } // namespace __interception #endif // SANITIZER_WINDOWS |
