Use OS X (not Simulator) build for x86_64 on OS X.

[cycript.git] / Mach / Inject.cpp

diff --git a/Mach/Inject.cpp b/Mach/Inject.cpp
index c70e83cc9c7432a90a66bcf0b2f291f92d622d41..7d805992c09c31a88515e0aa3b648b395f5cf0e6 100644 (file)
--- a/Mach/Inject.cpp
+++ b/Mach/Inject.cpp
@@ -207,6 +207,7 @@ void InjectLibrary(pid_t pid) {
 
     baton->dyld = info.all_image_info_addr;
     baton->pid = getpid();
 
     baton->dyld = info.all_image_info_addr;
     baton->pid = getpid();

+    memset(baton->error, 0, sizeof(baton->error));

     memcpy(baton->library, library, length);
 
     mach_vm_size_t size(depth + Stack_);
     memcpy(baton->library, library, length);
 
     mach_vm_size_t size(depth + Stack_);


@@ -291,8 +292,11 @@ void InjectLibrary(pid_t pid) {
     mach_vm_size_t error(sizeof(baton->error));
     _krncall(mach_vm_read_overwrite(task, data + offsetof(Baton, error), sizeof(baton->error), reinterpret_cast<mach_vm_address_t>(&baton->error), &error));
     _assert(error == sizeof(baton->error));
     mach_vm_size_t error(sizeof(baton->error));
     _krncall(mach_vm_read_overwrite(task, data + offsetof(Baton, error), sizeof(baton->error), reinterpret_cast<mach_vm_address_t>(&baton->error), &error));
     _assert(error == sizeof(baton->error));

-    if (baton->error[0] != '\0')
+
+    if (baton->error[0] != '\0') {
+        baton->error[sizeof(baton->error) - 1] = '\0';

         CYThrow("%s", baton->error);
         CYThrow("%s", baton->error);

+    }

 
     _krncall(mach_vm_deallocate(task, code, trampoline->size_));
     _krncall(mach_vm_deallocate(task, stack, size));
 
     _krncall(mach_vm_deallocate(task, code, trampoline->size_));
     _krncall(mach_vm_deallocate(task, stack, size));