Skip to content

fix macox 10.13 or later #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
*.swp
out
.vscode
Makefile
*.log
config.status
mconfig.pyc
1 change: 1 addition & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ mconfig.build_and_link_c_objs(
'(src)/lib/darwin/interpose.c',
'(src)/lib/darwin/objc-asm.S',
'(src)/lib/darwin/objc.c',
'(src)/lib/darwin/macho.c',
'(src)/lib/darwin/read.c',
'(src)/lib/darwin/substrate-compat.c',
'(src)/lib/darwin/execmem.c',
Expand Down
4 changes: 2 additions & 2 deletions lib/darwin/find-syms.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "substitute-internal.h"
#include "dyld_cache_format.h"

extern const struct dyld_all_image_infos *_dyld_get_all_image_infos();
extern struct dyld_all_image_infos * my_get_all_image_infos();

static pthread_once_t dyld_inspect_once = PTHREAD_ONCE_INIT;
/* and its fruits: */
Expand Down Expand Up @@ -280,7 +280,7 @@ ok2: ;
*/

static void inspect_dyld() {
const struct dyld_all_image_infos *aii = _dyld_get_all_image_infos();
const struct dyld_all_image_infos *aii = my_get_all_image_infos();
const void *dyld_hdr = aii->dyldImageLoadAddress;

const char *names[2] = { "__ZNK16ImageLoaderMachO8getSlideEv",
Expand Down
4 changes: 2 additions & 2 deletions lib/darwin/inject.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <stdio.h>
#include <stdbool.h>

extern const struct dyld_all_image_infos *_dyld_get_all_image_infos();
extern struct dyld_all_image_infos * my_get_all_image_infos();

#define DEFINE_STRUCTS

Expand Down Expand Up @@ -104,7 +104,7 @@ static int find_foreign_images(mach_port_t task,
* look up the symbols locally and don't have to do the rest of the
* syscalls... not sure if this is any faster, but whatever. */
if (FIELD(version) >= 13) {
const struct dyld_all_image_infos *local_aii = _dyld_get_all_image_infos();
const struct dyld_all_image_infos *local_aii = my_get_all_image_infos();
if (local_aii->version >= 13 &&
FIELD(sharedCacheSlide) == local_aii->sharedCacheSlide &&
!memcmp(FIELD(sharedCacheUUID), local_aii->sharedCacheUUID, 16)) {
Expand Down
20 changes: 20 additions & 0 deletions lib/darwin/macho.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#include <stdint.h>
#include <mach/mach.h>
#include <darwin/macho.h>


struct dyld_all_image_infos * my_get_all_image_infos()
{
kern_return_t kr;
task_flavor_t flavor = TASK_DYLD_INFO;
task_dyld_info_data_t infoData;
mach_msg_type_number_t task_info_outCnt = TASK_DYLD_INFO_COUNT;
kr = task_info(mach_task_self(), flavor, (task_info_t) &infoData, &task_info_outCnt);
if (kr != KERN_SUCCESS) {
//KR_ERROR(kr);
return 0;
}
struct dyld_all_image_infos *allImageInfos =
(struct dyld_all_image_infos *) infoData.all_image_info_addr;
return allImageInfos;
}
3 changes: 3 additions & 0 deletions lib/darwin/macho.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#include <stdint.h>
#include <mach/mach.h>
struct dyld_all_image_infos * my_get_all_image_infos();