Merge pull request #2 from Frago9876543210/master

Print symbol if error has occurred
minecraft-linux · Jul 31, 2019 · a788e47 · a788e47
2 parents 35a7d75 + c2cbf6e
commit a788e47
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,7 +11,7 @@ endif()
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-set(MODLOADER_VERSION "Preview 1")
+set(MODLOADER_VERSION "Preview 2")
 
 add_subdirectory(dep/funchook)
 

diff --git a/include/modloader/hook.h b/include/modloader/hook.h
@@ -9,6 +9,8 @@ extern "C" {
 
 typedef void modloader_hook_t;
 
+void* modloader_dlsym_print_error(const char *sym);
+
 modloader_hook_t* modloader_hook(void *sym, void *hook, void **orig);
 
 void modloader_destroy_hook(modloader_hook_t*);
@@ -48,7 +50,7 @@ class AutoHook {
     }
 
 
-    AutoHook(const char *sym, void *hook, void **orig) : AutoHook(dlsym(RTLD_DEFAULT, sym), hook, orig) {
+    AutoHook(const char *sym, void *hook, void **orig) : AutoHook(modloader_dlsym_print_error(sym), hook, orig) {
     }
 
     // workaround for a warning

diff --git a/src/hook.cpp b/src/hook.cpp
@@ -9,6 +9,13 @@ using namespace modloader;
 
 extern "C" {
 
+void *modloader_dlsym_print_error(const char *sym) {
+    void *ptr = dlsym(RTLD_DEFAULT, sym);
+    if (!ptr)
+        Log::error("Hook", "Unknown symbol %s", sym);
+    return ptr;
+}
+
 modloader_hook_t *modloader_hook(void *sym, void *hook, void **orig) {
     funchook_t *h = funchook_create();
     if (!h)