Fixed possible merging of messages

arcturus-prime · Jul 19, 2024 · 539aa57 · 539aa57
1 parent 7962d05
commit 539aa57
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/client/src/main.rs b/client/src/main.rs
@@ -1,12 +1,12 @@
 mod packet;
 
-use tokio::net::windows::named_pipe::ClientOptions;
+use tokio::{io::AsyncReadExt, net::windows::named_pipe::ClientOptions};
 
 #[tokio::main(flavor = "current_thread")]
 async fn main() {
     println!("Connecting to server...");
 
-    let client = loop {
+    let mut client = loop {
         let options = ClientOptions::new().open(r"//./pipe/StudioDumper");
 
         match options {
@@ -22,11 +22,14 @@ async fn main() {
     loop {
         client.readable().await.unwrap();
 
-        let size = match client.try_read(&mut buffer) {
-            Ok(n) => if n == 0 { continue } else { n },
-            Err(_) => continue,
+        let Ok(size) = client.read_u32_le().await else {
+            continue;
         };
 
-        println!("Incoming Packet: {:02X?}", &buffer[..size])
+        if let Err(_) = client.read_exact(&mut buffer[..size as usize]).await {
+            continue;
+        }
+
+        println!("Incoming Packet: {:02X?}", &buffer[..size as usize]);
     }
 }
diff --git a/dumper/src/VFTable.h b/dumper/src/VFTable.h
@@ -3,6 +3,7 @@
 #include "Region.h"
 
 #include <cstdint>
+#include <iostream>
 #include <optional>
 #include <string>
 #include <windows.h>
@@ -15,8 +16,6 @@ class VFTable
     uintptr_t* vftable;
 
   public:
-    VFTable() = default;
-
     static inline std::optional<VFTable> find(const Region& region, const std::string& mangled_name)
     {
         auto results = region.find(mangled_name);
@@ -28,13 +27,13 @@ class VFTable
 
             auto xref_ibos = region.find(std::string((char*) &ibo_type_descriptor, 4));
 
-            for (auto xref_ibo : xref_ibos)
+            for (const auto& xref_ibo : xref_ibos)
             {
                 uintptr_t completeObjLoc = xref_ibo - 0xC;
                 auto vftable_results = region.find(std::string((char*) &completeObjLoc, 8));
 
                 if (vftable_results.empty())
-                    return std::nullopt;
+                    continue;
 
                 auto vftable = (uintptr_t*) vftable_results[0] + 1;
 
@@ -48,7 +47,7 @@ class VFTable
                 ctx.vftable = vftable;
 
                 return ctx;
-            };
+            }
         }
 
         return std::nullopt;

diff --git a/dumper/src/main.cpp b/dumper/src/main.cpp
@@ -30,9 +30,10 @@ void hook_24(RakNet::RakPeer* rakPeer, char _1)
         auto packet = rakPeer->queue_2.array[i];
 
         DWORD num;
-        auto result = WriteFile(g_pipe, packet->data, packet->size, &num, NULL);
+        auto result_1 = WriteFile(g_pipe, (uint8_t*) &packet->size, 4, &num, NULL);
+        auto result_2 = WriteFile(g_pipe, packet->data, packet->size, &num, NULL);
 
-        if (result)
+        if (result_1 && result_2)
             continue;
 
         if (GetLastError() == ERROR_NO_DATA)