Merge pull request #21 from mcbegamerxx954/main

Reverted fixes

Author: ENDERMANYK

src/Loader.cpp

@@ -10,6 +10,7 @@
 #include "Util.h"
 #include "material.h"
 
+
 //==========================================================================================================================================
 
 typedef struct _LoaderInvocationListener LoaderInvocationListener;
@@ -42,7 +43,7 @@ struct InvocationState {
     std::string* retstr;
 };
 
-
+GumAddress minecraftpeBaseAddr;
 GumAddress ResourcePackManager_ResourcePackManager;
 GumAddress AppPlatform_readAssetFile;
 
@@ -58,14 +59,14 @@ void __attribute__((constructor)) init() {
 
     gum_init();
 
-    ModuleRange minecraftpeDetails = get_module_range();
-    if (minecraftpeDetails.addr == 0 || minecraftpeDetails.len == 0) {
-        // Failed initialization
-        return;
-    }
+    minecraftpeBaseAddr = gum_module_find_base_address("libminecraftpe.so");
+
+    GumModuleMap* moduleMap = gum_module_map_new();
+    const GumModuleDetails* minecraftpeDetails = gum_module_map_find(moduleMap, minecraftpeBaseAddr);
+
     #if __arm__
         //ResourcePackManager::ResourcePackManager
-        ResourcePackManager_ResourcePackManager = FindSignatures(&minecraftpeDetails,
+        ResourcePackManager_ResourcePackManager = FindSignatures(minecraftpeDetails,
             //1.20.50-1.20.81
             //"F0 B5 03 AF 2D E9 00 07 90 B0 05 46 AD 48 98 46 92 46 78 44 00 68 00 68 0F 90 08 69",
             //1.21.0-1.21.31
@@ -81,7 +82,7 @@ void __attribute__((constructor)) init() {
         );
 
         //AppPlatform::readAssetFile
-        AppPlatform_readAssetFile = FindSignatures(&minecraftpeDetails,
+        AppPlatform_readAssetFile = FindSignatures(minecraftpeDetails,
             //1.20.50.21preview
             //"F0 B5 03 AF 4D F8 04 8D 9C B0 04 46 6E 48 78 44 00 68 00 68 1B 90 00 20 CD E9 08 00",
             //1.20.50-1.20.73
@@ -102,15 +103,15 @@ void __attribute__((constructor)) init() {
         }
     #elif __aarch64__
         //ResourcePackManager::ResourcePackManager
-        ResourcePackManager_ResourcePackManager = FindSignatures(&minecraftpeDetails,
+        ResourcePackManager_ResourcePackManager = FindSignatures(minecraftpeDetails,
             //1.20.50-1.21.50
             "FF 03 03 D1 FD 7B 07 A9 FD C3 01 91 F9 43 00 F9 F8 5F 09 A9 F6 57 0A A9 F4 4F 0B A9 59 D0 3B D5 F6 03 03 2A 28 17 40 F9 F5 03 02 AA F3 03 00 AA A8 83 1F F8 28 10 40 F9",
 			//1.21.60.21preview
             "FF 83 02 D1 FD 7B 06 A9 FD 83 01 91 F8 5F 07 A9 F6 57 08 A9 F4 4F 09 A9 58 D0 3B D5 F6 03 03 2A 08 17 40 F9 F5 03 02 AA F3 03 00 AA A8 83 1F F8 28 10 40 F9 28 01 00 B4"
         );
 
         //AppPlatform::readAssetFile
-        AppPlatform_readAssetFile = FindSignatures(&minecraftpeDetails,
+        AppPlatform_readAssetFile = FindSignatures(minecraftpeDetails,
             //1.20.50-1.20.73
             "FF 03 04 D1 FD 7B 0C A9 FD 03 03 91 FC 5F 0D A9 F6 57 0E A9 F4 4F 0F A9 57 D0 3B D5 F3 03 08 AA E8 16 40 F9 A8 83 1F F8 FF 7F 02 A9",
             //1.20.80-1.21.50
@@ -128,6 +129,8 @@ void __attribute__((constructor)) init() {
             printf("AppPlatform::readAssetFile not found\n");
         }
     #endif
+
+    g_object_unref(moduleMap);
 
     interceptor = gum_interceptor_obtain();
     listener = (GumInvocationListener*) g_object_new(LOADER_TYPE_INVOCATION_LISTENER, NULL);

src/Util.h

@@ -4,54 +4,13 @@
 #include <vector>
 #include <string>
 #include "frida-gum.h"
-#include <stddef.h>
-#include <stdint.h>
-#include <link.h>
-#include <string.h>
 
 #define FindSignature FindSig
 #define FindSignatures(moduleInfo, ...) FindSigs(moduleInfo, {__VA_ARGS__})
 
-
-struct ModuleRange {
-   uintptr_t addr;
-   size_t len;
-};
-
-int callback(struct dl_phdr_info* dl_info, size_t _size, void* data) {
-  // Skip if module is not minecraftpe
-  if (strstr(dl_info->dlpi_name, "libminecraftpe") == NULL)  {
-    return 0;
-  }
-  
-  for (size_t i = 0; i < dl_info->dlpi_phnum; i++) {
-    const ElfW(Phdr) phdr = dl_info->dlpi_phdr[i];
-    // Im so sorry
-    #define PF_X    0x1
-    // Check if we found a loadable and executable section
-    // should be where the code is at
-    if (phdr.p_type == PT_LOAD && phdr.p_flags & PF_X) {   
-      // Retrieve ModuleRange
-      struct ModuleRange* mod_range = (struct ModuleRange*) data;
-      mod_range->addr = dl_info->dlpi_addr + phdr.p_paddr;
-      mod_range->len = phdr.p_memsz;
-      // Stop dl_iterate_phdr
-      return -1;
-    }
-  }
-  return 0;
-}
-
-/// Get module range of minecraftpe
-struct ModuleRange get_module_range() {
-  struct ModuleRange mod_range = {0,0};
-  dl_iterate_phdr(callback,(void*) &mod_range);
-  return mod_range;
-}
-
-inline uintptr_t FindSig(const ModuleRange* moduleInfo, const std::string& signature) {
-    uintptr_t moduleBase = moduleInfo->addr;
-    size_t moduleSize = moduleInfo->len;
+inline uintptr_t FindSig(const GumModuleDetails* moduleInfo, const std::string& signature) {
+    uintptr_t moduleBase = (uintptr_t)moduleInfo->range->base_address;
+    size_t moduleSize = moduleInfo->range->size;
 
     std::vector<uint16_t> pattern;
     for (int i = 0; i < signature.size(); i++) {
@@ -94,7 +53,7 @@ inline uintptr_t FindSig(const ModuleRange* moduleInfo, const std::string& signa
     return 0;
 }
 
-inline uintptr_t FindSigs(const ModuleRange* moduleInfo, const std::initializer_list<std::string>& signatures) {
+inline uintptr_t FindSigs(const GumModuleDetails* moduleInfo, const std::initializer_list<std::string>& signatures) {
     uintptr_t ptr = 0;
     for (auto& sig : signatures) {
         if ((ptr = FindSig(moduleInfo, sig))) {