fixed some ide warnings..

Author: Antibioticss

.gitignore

@@ -20,6 +20,7 @@
 *.dSYM
 *.dylib
 .zed
+.idea
 .vscode
 example
 infer-out

include/tinyhook.h

@@ -2,8 +2,6 @@
 #define tinyhook_h
 
 #include <objc/runtime.h>
-#include <stdbool.h>
-#include <stddef.h>
 #include <stdint.h>
 
 #ifdef __cplusplus
@@ -27,7 +25,7 @@ int tiny_hook(void *function, void *destination, void **origin);
 
 int tiny_hook_ex(th_bak_t *bak, void *function, void *destination, void **origin);
 
-int tiny_unhook_ex(th_bak_t *bak);
+int tiny_unhook_ex(const th_bak_t *bak);
 
 int tiny_insert(void *address, void *destination);
 

src/exhook.c

@@ -1,7 +1,7 @@
 #include "../include/tinyhook.h"
 #include "private.h"
 
-static int get_jump_size(void *src, void *dst) {
+static int get_jump_size(const void *src, const void *dst) {
     bool is_far = need_far_jump(src, dst);
 #ifdef __arm64__
     return is_far ? 12 : 4;
@@ -17,6 +17,6 @@ int tiny_hook_ex(th_bak_t *bak, void *function, void *destination, void **origin
     return tiny_hook(function, destination, origin);
 }
 
-int tiny_unhook_ex(th_bak_t *bak) {
+int tiny_unhook_ex(const th_bak_t *bak) {
     return write_mem(bak->address, bak->head_bak, bak->jump_size);
 }

src/interpose.c

@@ -21,18 +21,18 @@ int tiny_interpose(uint32_t image_index, const char *symbol_name, void *replacem
             if (strcmp(segment->segname, "__DATA_CONST") == 0) {
                 if (sym_sects[0]) continue;
                 struct section_64 *data_const_sect = (void *)(segment + 1);
-                for (int i = 0; i < segment->nsects; i++) {
-                    if ((data_const_sect[i].flags & SECTION_TYPE) == S_NON_LAZY_SYMBOL_POINTERS) {
-                        sym_sects[0] = data_const_sect + i; // __nl_symbol_ptr
+                for (int j = 0; j < segment->nsects; j++) {
+                    if ((data_const_sect[j].flags & SECTION_TYPE) == S_NON_LAZY_SYMBOL_POINTERS) {
+                        sym_sects[0] = data_const_sect + j; // __nl_symbol_ptr
                     }
                 }
             }
             else if (strcmp(segment->segname, "__DATA") == 0) {
                 if (sym_sects[1]) continue;
                 struct section_64 *data_sect = (void *)(segment + 1);
-                for (int i = 0; i < segment->nsects; i++) {
-                    if ((data_sect[i].flags & SECTION_TYPE) == S_LAZY_SYMBOL_POINTERS) {
-                        sym_sects[1] = data_sect + i; // __la_symbol_ptr
+                for (int j = 0; j < segment->nsects; j++) {
+                    if ((data_sect[j].flags & SECTION_TYPE) == S_LAZY_SYMBOL_POINTERS) {
+                        sym_sects[1] = data_sect + j; // __la_symbol_ptr
                     }
                 }
             }
@@ -48,7 +48,11 @@ int tiny_interpose(uint32_t image_index, const char *symbol_name, void *replacem
         }
         ld_command = (void *)ld_command + ld_command->cmdsize;
     }
-    intptr_t linkedit_base = image_slide + linkedit_cmd->vmaddr - linkedit_cmd->fileoff;
+    if (linkedit_cmd == NULL || symtab_cmd == NULL || dysymtab_cmd == NULL) {
+        LOG_ERROR("tiny_interpose: bad mach-o structure!");
+        return 1;
+    }
+    uint64_t linkedit_base = image_slide + linkedit_cmd->vmaddr - linkedit_cmd->fileoff;
     char *str_tbl = (void *)linkedit_base + symtab_cmd->stroff;
     struct nlist_64 *nl_tbl = (void *)linkedit_base + symtab_cmd->symoff;
     uint32_t *indirect_sym_tbl = (void *)linkedit_base + dysymtab_cmd->indirectsymoff;
@@ -60,7 +64,7 @@ int tiny_interpose(uint32_t image_index, const char *symbol_name, void *replacem
         if (!sym_sec) continue;
         void **sym_ptrs = (void *)sym_sec->addr + image_slide;
         uint32_t *indirect_sym_entry = indirect_sym_tbl + sym_sec->reserved1; // reserved1 is an index!
-        int nptrs = sym_sec->size / sizeof(void *);
+        size_t nptrs = sym_sec->size / sizeof(void *);
         for (int j = 0; j < nptrs; j++) {
             uint32_t symtab_index = indirect_sym_entry[j];
             if (symtab_index == INDIRECT_SYMBOL_LOCAL ||

src/memory.c

@@ -2,6 +2,9 @@
 #include "private.h"
 
 #include <string.h> // memcpy()
+#ifndef COMPACT
+#include <mach/mach_error.h> // mach_error_string()
+#endif
 
 int read_mem(void *destination, const void *source, size_t len) {
     int kr = 0;

src/private.h

@@ -19,7 +19,6 @@
 #ifdef COMPACT
     #define LOG_ERROR(fmt, ...) ((void)0)
 #else
-    #include <mach/mach_error.h> // mach_error_string()
     #include <printf.h>          // fprintf()
     #define LOG_ERROR(fmt, ...) fprintf(stderr, "ERROR [%s:%d]: " fmt "\n", __FILE__, __LINE__, ##__VA_ARGS__)
 #endif
@@ -44,6 +43,6 @@
     #define X86_64_MOV_RM64 0x8b48     // mov      r64, [r64]
 #endif
 
-bool need_far_jump(void *src, void *dst);
+bool need_far_jump(const void *src, const void *dst);
 
 #endif

src/symsolve/symexport.c

@@ -87,9 +87,13 @@ void *symexp_solve(uint32_t image_index, const char *symbol_name) {
         LOG_ERROR("symexp_solve: LC_DYLD_INFO_ONLY segment not found!");
         return NULL;
     }
+    if (linkedit_cmd == NULL) {
+        LOG_ERROR("symexp_solve: __LINKEDIT segment not found!");
+        return NULL;
+    }
     // stroff and strtbl are in the __LINKEDIT segment
     // Its offset will change when loaded into the memory, so we need to add this slide
-    intptr_t linkedit_base = image_slide + linkedit_cmd->vmaddr - linkedit_cmd->fileoff;
+    uint64_t linkedit_base = image_slide + linkedit_cmd->vmaddr - linkedit_cmd->fileoff;
     uint8_t *export_offset = (uint8_t *)linkedit_base + dyldinfo_cmd->export_off;
     symbol_address = trie_query(export_offset, symbol_name);
 

src/symsolve/symtable.c

@@ -31,9 +31,13 @@ void *symtbl_solve(uint32_t image_index, const char *symbol_name) {
         }
         ld_command = (void *)ld_command + ld_command->cmdsize;
     }
+    if (linkedit_cmd == NULL || symtab_cmd == NULL) {
+        LOG_ERROR("symtbl_solve: bad mach-o structure!");
+        return NULL;
+    }
     // stroff and strtbl are in the __LINKEDIT segment
     // Its offset will change when loaded into the memory, so we need to add this slide
-    intptr_t linkedit_base = image_slide + linkedit_cmd->vmaddr - linkedit_cmd->fileoff;
+    uint64_t linkedit_base = image_slide + linkedit_cmd->vmaddr - linkedit_cmd->fileoff;
     struct nlist_64 *nl_tbl = (void *)linkedit_base + symtab_cmd->symoff;
     char *str_tbl = (void *)linkedit_base + symtab_cmd->stroff;
     for (int j = 0; j < symtab_cmd->nsyms; j++) {

src/tinyhook.c

@@ -3,6 +3,9 @@
 
 #include <stdint.h>
 #include <string.h> // memcpy()
+#ifndef COMPACT
+#include <mach/mach_error.h> // mach_error_string()
+#endif
 
 #ifdef __x86_64__
     #include "fde64/fde64.h"
@@ -13,8 +16,7 @@ static int calc_near_jump(uint8_t *output, void *src, void *dst, bool link) {
 #ifdef __aarch64__
     // b/bl imm    ; go to dst
     jump_size = 4;
-    uint32_t insn;
-    insn = (dst - src) >> 2 & 0x3ffffff;
+    uint32_t insn = (dst - src) >> 2 & 0x3ffffff;
     insn |= link ? AARCH64_BL : AARCH64_B;
     *(uint32_t *)output = insn;
 #elif __x86_64__
@@ -33,8 +35,7 @@ static int calc_far_jump(uint8_t *output, void *src, void *dst, bool link) {
     // add     x17, x17, imm    ; x17 -> dst
     // br/blr  x17
     jump_size = 12;
-    uint32_t insn;
-    insn = (((int64_t)dst >> 12) - ((int64_t)src >> 12)) & 0x1fffff;
+    uint32_t insn = (((int64_t)dst >> 12) - ((int64_t)src >> 12)) & 0x1fffff;
     insn = ((insn & 0x3) << 29) | (insn >> 2 << 5) | AARCH64_ADRP;
     *(uint32_t *)output = insn;
     insn = ((int64_t)dst & 0xfff) << 10 | AARCH64_ADD;
@@ -50,7 +51,7 @@ static int calc_far_jump(uint8_t *output, void *src, void *dst, bool link) {
     return jump_size;
 }
 
-bool need_far_jump(void *src, void *dst) {
+bool need_far_jump(const void *src, const void *dst) {
     long long distance = dst > src ? dst - src : src - dst;
 #ifdef __aarch64__
     return distance >= 128 * MB;