CR feedback

Author: RDIL

patcher-darwin/src/main.cpp

@@ -3,6 +3,7 @@
 
 #include <chrono>
 #include <cstdio>
+#include <cstring>
 #include <string>
 #include <thread>
 #include <unistd.h>
@@ -17,9 +18,9 @@ static void print_usage() {
     printf("  --headless                     Patch once and exit\n");
     printf("  --domain <url>                 Server domain (default: "
         "127.0.0.1)\n");
-    printf("  --use-http                     Use HTTP instead of HTTPS\n");
+    printf("  --dont-use-http                Use HTTPS instead of HTTP\n");
     printf(
-        "  --optional-dynamic-resources   Allow optional dynamic resources\n");
+        "  --non-optional-dynamic-resources   Allow optional dynamic resources\n");
     printf("  --help                         Show this help message\n");
 }
 
@@ -50,8 +51,8 @@ int main(int argc, char *argv[]) {
             }
         } else if (strcmp(argv[i], "--dont-use-http") == 0) {
             use_http = false;
-        } else if (strcmp(argv[i], "--optional-dynamic-resources") == 0) {
-            optional_dynres = true;
+        } else if (strcmp(argv[i], "--non-optional-dynamic-resources") == 0) {
+            optional_dynres = false;
         } else if (strcmp(argv[i], "--help") == 0) {
             print_usage();
             return 0;

patcher-darwin/src/memory.cpp

@@ -75,6 +75,8 @@ namespace peacock {
 
             if (kr == KERN_SUCCESS) {
                 *old_prot = info.protection;
+                if (object_name != MACH_PORT_NULL)
+                    mach_port_deallocate(mach_task_self(), object_name);
             } else {
                 *old_prot = VM_PROT_NONE;
             }

patcher-darwin/src/patcher.cpp

@@ -32,8 +32,12 @@ namespace peacock {
         if (!scanned)
             return nullptr;
 
-        PatchRegistry::instance().add_version(identifier, std::move(*scanned));
-        return PatchRegistry::instance().find_version(identifier);
+        if (identifier != 0) {
+            PatchRegistry::instance().add_version(identifier, std::move(*scanned));
+            return PatchRegistry::instance().find_version(identifier);
+        }
+
+        return new HitmanVersion(std::move(*scanned));
     }
 
     /// Collect patches to apply based on user options.
@@ -91,6 +95,7 @@ namespace peacock {
             if (!Memory::write(task, addr, data_to_write.data(),
                                data_to_write.size())) {
                 log("Failed to write at offset 0x" + to_hex(patch->offset));
+                Memory::protect(task, addr, data_to_write.size(), old_prot, nullptr);
                 return false;
             }
 
@@ -159,8 +164,15 @@ namespace peacock {
 
         const auto patches = collect_patches(*version, options);
 
-        // Build the custom URL bytes
+        // Build the custom URL bytes (must fit in the configdomain buffer)
+        static constexpr size_t kMaxConfigDomainLen = 256;
         const std::string &url = options.custom_config_domain;
+        if (url.size() >= kMaxConfigDomainLen) {
+            log("Custom config domain too long (" + std::to_string(url.size()) +
+                " bytes, max " + std::to_string(kMaxConfigDomainLen - 1) + ")");
+            Memory::close_task(task);
+            return false;
+        }
         std::vector<uint8_t> url_bytes(url.begin(), url.end());
         url_bytes.push_back(0x00);
 

patcher-darwin/src/process.cpp

@@ -1,5 +1,6 @@
 #include "process.h"
 
+#include <cstring>
 #include <libproc.h>
 #include <mach-o/dyld_images.h>
 #include <mach-o/loader.h>
@@ -89,9 +90,11 @@ namespace peacock {
             if (lc.cmd == LC_SEGMENT_64) {
                 segment_command_64 seg{};
                 out_size = sizeof(seg);
-                mach_vm_read_overwrite(
+                kr = mach_vm_read_overwrite(
                     task, cmd_offset, sizeof(seg),
                     reinterpret_cast<mach_vm_address_t>(&seg), &out_size);
+                if (kr != KERN_SUCCESS)
+                    return false;
 
                 // skip __PAGEZERO — it's a non-readable guard region
                 if (strcmp(seg.segname, SEG_PAGEZERO) == 0) {
@@ -173,9 +176,9 @@ namespace peacock {
             return false;
         }
 
-        compute_image_size(task, base_address, image_size);
+        const bool ok = compute_image_size(task, base_address, image_size);
 
         mach_port_deallocate(mach_task_self(), task);
-        return true;
+        return ok;
     }
 }

patcher-darwin/src/scanner.cpp

@@ -1,5 +1,6 @@
 #include "scanner.h"
 #include "log.h"
+#include <cstring>
 
 namespace peacock {
     // ARM64 instructions are 4-byte aligned; use step of 4 instead of 16
@@ -63,9 +64,11 @@ namespace peacock {
         const uint8_t effective_alignment = alignment + leading_wildcards;
 
         const size_t pat_len = byte_pattern.size();
-        const size_t search_end = data.size() - pat_len;
 
-        for (size_t i = effective_alignment; i < search_end; i += kArm64InstructionAlignment) {
+        if (data.size() < pat_len)
+            return results;
+
+        for (size_t i = effective_alignment; i + pat_len <= data.size(); i += kArm64InstructionAlignment) {
             if (data[i] != byte_pattern[0])
                 continue;
 
@@ -203,7 +206,7 @@ namespace peacock {
         // Verify the cbz: byte 3 should be 0x34 (CBZ w-register)
         if (auth1_orig[3] != 0x34) {
             log("AOB scan failed: expected CBZ at authheader patch 1 "
-                "(got 0x" + std::to_string(auth1_orig[3]) + ")");
+                "(got 0x" + to_hex(auth1_orig[3]) + ")");
             return std::nullopt;
         }