fix raw bytes (de)serialization (#322)

altmp · Aug 14, 2024 · 4ad0910 · 4ad0910
1 parent 88b992a
commit 4ad0910
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/shared/helpers/Serialization.cpp b/shared/helpers/Serialization.cpp
@@ -518,11 +518,11 @@ alt::MValueByteArray V8Helpers::V8ToRawBytes(v8::Local<v8::Value> val)
     v8::ValueSerializer serializer(isolate, &delegate);
     delegate.SetSerializer(&serializer);
 
-    serializer.WriteHeader();
-
     // Write the magic bytes to the buffer
     serializer.WriteRawBytes(magicBytes, sizeof(magicBytes));
 
+    serializer.WriteHeader();
+
     // Write the serialized value to the buffer
     bool result;
     if(!serializer.WriteValue(ctx, val).To(&result) || !result) return alt::MValueByteArray();
@@ -547,14 +547,14 @@ v8::MaybeLocal<v8::Value> V8Helpers::RawBytesToV8(alt::MValueByteArrayConst rawB
     v8::ValueDeserializer deserializer(isolate, data, size, &delegate);
     delegate.SetDeserializer(&deserializer);
 
-    bool headerValid;
-    if(!deserializer.ReadHeader(ctx).To(&headerValid) || !headerValid) return v8::MaybeLocal<v8::Value>();
-
     // Check for magic bytes
     uint8_t* magicBytesPtr;
     if(!deserializer.ReadRawBytes(sizeof(magicBytes), (const void**)&magicBytesPtr)) return v8::MaybeLocal<v8::Value>();
     if(memcmp(magicBytesPtr, magicBytes, sizeof(magicBytes)) != 0) return v8::MaybeLocal<v8::Value>();
 
+    bool headerValid;
+    if(!deserializer.ReadHeader(ctx).To(&headerValid) || !headerValid) return v8::MaybeLocal<v8::Value>();
+
     // Deserialize the value
     v8::MaybeLocal<v8::Value> result = deserializer.ReadValue(ctx);