Commit 607a170b authored by Chen Bill's avatar Chen Bill Committed by GitHub

fix buffer read/write (#576)

parent 8b19193c
#ifndef BUFFER_H
#define BUFFER_H
#include <cstring>
#include <vector>
inline void buffer_read_block(unsigned char*& p, void* dest, size_t size) {
std::memcpy(dest, p, size);
p += size;
}
template<typename T>
inline T buffer_read(unsigned char*& p) {
T ret{};
buffer_read_block(p, &ret, sizeof(T));
return ret;
}
inline void buffer_write_block(unsigned char*& p, const void* src, size_t size) {
std::memcpy(p, src, size);
p += size;
}
template<typename T>
inline void buffer_write(unsigned char*& p, T value) {
buffer_write_block(p, &value,sizeof(T));
}
inline void vector_write_block(std::vector<unsigned char>& buffer, const void* src, size_t size) {
const auto len = buffer.size();
buffer.resize(len + size);
std::memcpy(&buffer[len], src, size);
}
template<typename T>
inline void vector_write(std::vector<unsigned char>& buffer, T value) {
vector_write_block(buffer, &value, sizeof(T));
}
#endif //BUFFER_H
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include "group.h" #include "group.h"
#include "interpreter.h" #include "interpreter.h"
#include "ocgapi.h" #include "ocgapi.h"
#include "buffer.h"
#include <algorithm> #include <algorithm>
const std::unordered_map<uint32, uint32> card::second_code = { const std::unordered_map<uint32, uint32> card::second_code = {
...@@ -176,17 +177,16 @@ card::card(duel* pd) { ...@@ -176,17 +177,16 @@ card::card(duel* pd) {
xyz_materials_previous_count_onfield = 0; xyz_materials_previous_count_onfield = 0;
current.controler = PLAYER_NONE; current.controler = PLAYER_NONE;
} }
inline void update_cache(uint32& tdata, uint32& cache, int32*& p, uint32& query_flag, const uint32 flag) { inline void update_cache(uint32& tdata, uint32& cache, byte*& p, uint32& query_flag, const uint32 flag) {
if (tdata != cache) { if (tdata != cache) {
cache = tdata; cache = tdata;
*p = tdata; buffer_write<uint32_t>(p, tdata);
++p;
} }
else else
query_flag &= ~flag; query_flag &= ~flag;
} }
int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) { int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) {
int32* p = (int32*)buf; byte* p = buf;
std::pair<int32, int32> atk_def(-10, -10); std::pair<int32, int32> atk_def(-10, -10);
std::pair<int32, int32> base_atk_def(-10, -10); std::pair<int32, int32> base_atk_def(-10, -10);
if ((query_flag & QUERY_ATTACK) || (query_flag & QUERY_DEFENSE)) { if ((query_flag & QUERY_ATTACK) || (query_flag & QUERY_DEFENSE)) {
...@@ -196,15 +196,13 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) { ...@@ -196,15 +196,13 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) {
base_atk_def = get_base_atk_def(); base_atk_def = get_base_atk_def();
} }
//first 8 bytes: data length, query flag //first 8 bytes: data length, query flag
p += 2; p += 8;
if (query_flag & QUERY_CODE) { if (query_flag & QUERY_CODE) {
*p = data.code; buffer_write<uint32_t>(p, data.code);
++p;
} }
if (query_flag & QUERY_POSITION) { if (query_flag & QUERY_POSITION) {
uint32 tdata = get_info_location(); uint32 tdata = get_info_location();
*p = tdata; buffer_write<uint32_t>(p, tdata);
++p;
if (q_cache.info_location != tdata) { if (q_cache.info_location != tdata) {
q_cache.clear_cache(); q_cache.clear_cache();
q_cache.info_location = tdata; q_cache.info_location = tdata;
...@@ -213,59 +211,54 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) { ...@@ -213,59 +211,54 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) {
} }
if(!use_cache) { if(!use_cache) {
if (query_flag & QUERY_ALIAS) { if (query_flag & QUERY_ALIAS) {
*p = get_code(); uint32 tdata = get_code();
q_cache.current_code = *p; buffer_write<uint32_t>(p, tdata);
++p; q_cache.current_code = tdata;
} }
if (query_flag & QUERY_TYPE) { if (query_flag & QUERY_TYPE) {
*p = get_type(); uint32 tdata = get_type();
q_cache.type = *p; buffer_write<uint32_t>(p, tdata);
++p; q_cache.type = tdata;
} }
if (query_flag & QUERY_LEVEL) { if (query_flag & QUERY_LEVEL) {
*p = get_level(); uint32 tdata = get_level();
q_cache.level = *p; buffer_write<uint32_t>(p, tdata);
++p; q_cache.level = tdata;
} }
if (query_flag & QUERY_RANK) { if (query_flag & QUERY_RANK) {
*p = get_rank(); uint32 tdata = get_rank();
q_cache.rank = *p; buffer_write<uint32_t>(p, tdata);
++p; q_cache.rank = tdata;
} }
if (query_flag & QUERY_ATTRIBUTE) { if (query_flag & QUERY_ATTRIBUTE) {
*p = get_attribute(); uint32 tdata = get_attribute();
q_cache.attribute = *p; buffer_write<uint32_t>(p, tdata);
++p; q_cache.attribute = tdata;
} }
if (query_flag & QUERY_RACE) { if (query_flag & QUERY_RACE) {
*p = get_race(); uint32 tdata = get_race();
q_cache.race = *p; buffer_write<uint32_t>(p, tdata);
++p; q_cache.race = tdata;
} }
if (query_flag & QUERY_ATTACK) { if (query_flag & QUERY_ATTACK) {
*p = atk_def.first; buffer_write<int32_t>(p, atk_def.first);
q_cache.attack = atk_def.first; q_cache.attack = atk_def.first;
++p;
} }
if (query_flag & QUERY_DEFENSE) { if (query_flag & QUERY_DEFENSE) {
*p = atk_def.second; buffer_write<int32_t>(p, atk_def.second);
q_cache.defense = atk_def.second; q_cache.defense = atk_def.second;
++p;
} }
if (query_flag & QUERY_BASE_ATTACK) { if (query_flag & QUERY_BASE_ATTACK) {
*p = base_atk_def.first; buffer_write<int32_t>(p, base_atk_def.first);
q_cache.base_attack = base_atk_def.first; q_cache.base_attack = base_atk_def.first;
++p;
} }
if (query_flag & QUERY_BASE_DEFENSE) { if (query_flag & QUERY_BASE_DEFENSE) {
*p = base_atk_def.second; buffer_write<int32_t>(p, base_atk_def.second);
q_cache.base_defense = base_atk_def.second; q_cache.base_defense = base_atk_def.second;
++p;
} }
if (query_flag & QUERY_REASON) { if (query_flag & QUERY_REASON) {
*p = current.reason; buffer_write<uint32_t>(p, current.reason);
q_cache.reason = current.reason; q_cache.reason = current.reason;
++p;
} }
} }
else { else {
...@@ -296,8 +289,7 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) { ...@@ -296,8 +289,7 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) {
if((query_flag & QUERY_ATTACK)) { if((query_flag & QUERY_ATTACK)) {
if (atk_def.first != q_cache.attack) { if (atk_def.first != q_cache.attack) {
q_cache.attack = atk_def.first; q_cache.attack = atk_def.first;
*p = atk_def.first; buffer_write<int32_t>(p, atk_def.first);
++p;
} }
else else
query_flag &= ~QUERY_ATTACK; query_flag &= ~QUERY_ATTACK;
...@@ -305,8 +297,7 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) { ...@@ -305,8 +297,7 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) {
if((query_flag & QUERY_DEFENSE)) { if((query_flag & QUERY_DEFENSE)) {
if (atk_def.second != q_cache.defense) { if (atk_def.second != q_cache.defense) {
q_cache.defense = atk_def.second; q_cache.defense = atk_def.second;
*p = atk_def.second; buffer_write<int32_t>(p, atk_def.second);
++p;
} }
else else
query_flag &= ~QUERY_DEFENSE; query_flag &= ~QUERY_DEFENSE;
...@@ -314,8 +305,7 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) { ...@@ -314,8 +305,7 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) {
if((query_flag & QUERY_BASE_ATTACK)) { if((query_flag & QUERY_BASE_ATTACK)) {
if (base_atk_def.first != q_cache.base_attack) { if (base_atk_def.first != q_cache.base_attack) {
q_cache.base_attack = base_atk_def.first; q_cache.base_attack = base_atk_def.first;
*p = base_atk_def.first; buffer_write<int32_t>(p, base_atk_def.first);
++p;
} }
else else
query_flag &= ~QUERY_BASE_ATTACK; query_flag &= ~QUERY_BASE_ATTACK;
...@@ -323,8 +313,7 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) { ...@@ -323,8 +313,7 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) {
if((query_flag & QUERY_BASE_DEFENSE)) { if((query_flag & QUERY_BASE_DEFENSE)) {
if (base_atk_def.second != q_cache.base_defense) { if (base_atk_def.second != q_cache.base_defense) {
q_cache.base_defense = base_atk_def.second; q_cache.base_defense = base_atk_def.second;
*p = base_atk_def.second; buffer_write<int32_t>(p, base_atk_def.second);
++p;
} }
else else
query_flag &= ~QUERY_BASE_DEFENSE; query_flag &= ~QUERY_BASE_DEFENSE;
...@@ -335,73 +324,68 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) { ...@@ -335,73 +324,68 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) {
} }
} }
if (query_flag & QUERY_REASON_CARD) { if (query_flag & QUERY_REASON_CARD) {
*p = current.reason_card ? current.reason_card->get_info_location() : 0; uint32 tdata = current.reason_card ? current.reason_card->get_info_location() : 0;
++p; buffer_write<uint32_t>(p, tdata);
} }
if(query_flag & QUERY_EQUIP_CARD) { if(query_flag & QUERY_EQUIP_CARD) {
if (equiping_target) { if (equiping_target) {
*p = equiping_target->get_info_location(); uint32 tdata = equiping_target->get_info_location();
++p; buffer_write<uint32_t>(p, tdata);
} }
else else
query_flag &= ~QUERY_EQUIP_CARD; query_flag &= ~QUERY_EQUIP_CARD;
} }
if(query_flag & QUERY_TARGET_CARD) { if(query_flag & QUERY_TARGET_CARD) {
*p = (int32)effect_target_cards.size(); buffer_write<int32_t>(p, (int32_t)effect_target_cards.size());
++p;
for (auto& pcard : effect_target_cards) { for (auto& pcard : effect_target_cards) {
*p = pcard->get_info_location(); uint32 tdata = pcard->get_info_location();
++p; buffer_write<uint32_t>(p, tdata);
} }
} }
if(query_flag & QUERY_OVERLAY_CARD) { if(query_flag & QUERY_OVERLAY_CARD) {
*p = (int32)xyz_materials.size(); buffer_write<int32_t>(p, (int32_t)xyz_materials.size());
++p;
for (auto& xcard : xyz_materials) { for (auto& xcard : xyz_materials) {
*p = xcard->data.code; buffer_write<uint32_t>(p, xcard->data.code);
++p;
} }
} }
if(query_flag & QUERY_COUNTERS) { if(query_flag & QUERY_COUNTERS) {
*p = (int32)counters.size(); buffer_write<int32_t>(p, (int32_t)counters.size());
++p;
for (const auto& cmit : counters) { for (const auto& cmit : counters) {
*p = cmit.first + ((cmit.second[0] + cmit.second[1]) << 16); int32 tdata = cmit.first + ((cmit.second[0] + cmit.second[1]) << 16);
++p; buffer_write<int32_t>(p, tdata);
} }
} }
if (query_flag & QUERY_OWNER) { if (query_flag & QUERY_OWNER) {
*p = owner; int32 tdata = owner;
++p; buffer_write<int32_t>(p, tdata);
} }
if(query_flag & QUERY_STATUS) { if(query_flag & QUERY_STATUS) {
uint32 tdata = status & (STATUS_DISABLED | STATUS_FORBIDDEN | STATUS_PROC_COMPLETE); uint32 tdata = status & (STATUS_DISABLED | STATUS_FORBIDDEN | STATUS_PROC_COMPLETE);
if(!use_cache || (tdata != q_cache.status)) { if(!use_cache || (tdata != q_cache.status)) {
q_cache.status = tdata; q_cache.status = tdata;
*p = tdata; buffer_write<uint32_t>(p, tdata);
++p;
} }
else else
query_flag &= ~QUERY_STATUS; query_flag &= ~QUERY_STATUS;
} }
if(!use_cache) { if(!use_cache) {
if (query_flag & QUERY_LSCALE) { if (query_flag & QUERY_LSCALE) {
*p = get_lscale(); uint32 tdata = get_lscale();
q_cache.lscale = *p; buffer_write<uint32_t>(p, tdata);
++p; q_cache.lscale = tdata;
} }
if (query_flag & QUERY_RSCALE) { if (query_flag & QUERY_RSCALE) {
*p = get_rscale(); uint32 tdata = get_rscale();
q_cache.rscale = *p; buffer_write<uint32_t>(p, tdata);
++p; q_cache.rscale = tdata;
} }
if(query_flag & QUERY_LINK) { if(query_flag & QUERY_LINK) {
*p = get_link(); uint32 tdata = get_link();
q_cache.link = *p; buffer_write<uint32_t>(p, tdata);
++p; q_cache.link = tdata;
*p = get_link_marker(); tdata = get_link_marker();
q_cache.link_marker = *p; buffer_write<uint32_t>(p, tdata);
++p; q_cache.link_marker = tdata;
} }
} }
else { else {
...@@ -418,22 +402,18 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) { ...@@ -418,22 +402,18 @@ int32 card::get_infos(byte* buf, uint32 query_flag, int32 use_cache) {
uint32 link_marker = get_link_marker(); uint32 link_marker = get_link_marker();
if((link != q_cache.link) || (link_marker != q_cache.link_marker)) { if((link != q_cache.link) || (link_marker != q_cache.link_marker)) {
q_cache.link = link; q_cache.link = link;
*p = (int32)link; buffer_write<uint32_t>(p, link);
++p;
q_cache.link_marker = link_marker; q_cache.link_marker = link_marker;
*p = (int32)link_marker; buffer_write<uint32_t>(p, link_marker);
++p;
} }
else else
query_flag &= ~QUERY_LINK; query_flag &= ~QUERY_LINK;
} }
} }
int32* finalize = (int32*)buf; byte* finalize = buf;
*finalize = (byte*)p - buf; buffer_write<int32_t>(finalize, p - buf);
++finalize; buffer_write<uint32_t>(finalize, query_flag);
*finalize = query_flag; return (int32)(p - buf);
++finalize;
return (byte*)p - buf;
} }
uint32 card::get_info_location() { uint32 card::get_info_location() {
if(overlay_target) { if(overlay_target) {
......
...@@ -13,14 +13,7 @@ ...@@ -13,14 +13,7 @@
#include "effect.h" #include "effect.h"
#include "group.h" #include "group.h"
#include "ocgapi.h" #include "ocgapi.h"
#include "buffer.h"
inline void write_buffer_vector(std::vector<byte>& buffer, const void* data, int size) {
if (size > 0) {
const auto len = buffer.size();
buffer.resize(len + size);
std::memcpy(&buffer[len], data, size);
}
}
duel::duel() { duel::duel() {
lua = new interpreter(this); lua = new interpreter(this);
...@@ -125,16 +118,16 @@ void duel::restore_assumes() { ...@@ -125,16 +118,16 @@ void duel::restore_assumes() {
assumes.clear(); assumes.clear();
} }
void duel::write_buffer(const void* data, int size) { void duel::write_buffer(const void* data, int size) {
write_buffer_vector(message_buffer, data, size); vector_write_block(message_buffer, data, size);
} }
void duel::write_buffer32(uint32 value) { void duel::write_buffer32(uint32 value) {
write_buffer(&value, sizeof(value)); vector_write<uint32_t>(message_buffer, value);
} }
void duel::write_buffer16(uint16 value) { void duel::write_buffer16(uint16 value) {
write_buffer(&value, sizeof(value)); vector_write<uint16_t>(message_buffer, value);
} }
void duel::write_buffer8(uint8 value) { void duel::write_buffer8(uint8 value) {
write_buffer(&value, sizeof(value)); vector_write<unsigned char>(message_buffer, value);
} }
void duel::clear_buffer() { void duel::clear_buffer() {
message_buffer.clear(); message_buffer.clear();
......
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
#include "effect.h" #include "effect.h"
#include "field.h" #include "field.h"
#include "interpreter.h" #include "interpreter.h"
#include "buffer.h"
#include <set> #include <set>
static script_reader sreader = default_script_reader; static script_reader sreader = default_script_reader;
...@@ -206,7 +207,7 @@ extern "C" DECL_DLLEXPORT int32 query_card(intptr_t pduel, uint8 playerid, uint8 ...@@ -206,7 +207,7 @@ extern "C" DECL_DLLEXPORT int32 query_card(intptr_t pduel, uint8 playerid, uint8
return pcard->get_infos(buf, query_flag, use_cache); return pcard->get_infos(buf, query_flag, use_cache);
} }
else { else {
*((int32*)buf) = LEN_EMPTY; buffer_write<int32_t>(buf, LEN_EMPTY);
return LEN_EMPTY; return LEN_EMPTY;
} }
} }
...@@ -253,8 +254,7 @@ extern "C" DECL_DLLEXPORT int32 query_field_card(intptr_t pduel, uint8 playerid, ...@@ -253,8 +254,7 @@ extern "C" DECL_DLLEXPORT int32 query_field_card(intptr_t pduel, uint8 playerid,
int32 clen = pcard->get_infos(p, query_flag, use_cache); int32 clen = pcard->get_infos(p, query_flag, use_cache);
p += clen; p += clen;
} else { } else {
*((int32*)p) = LEN_EMPTY; buffer_write<int32_t>(p, LEN_EMPTY);
p += LEN_EMPTY;
} }
} }
} }
...@@ -264,8 +264,7 @@ extern "C" DECL_DLLEXPORT int32 query_field_card(intptr_t pduel, uint8 playerid, ...@@ -264,8 +264,7 @@ extern "C" DECL_DLLEXPORT int32 query_field_card(intptr_t pduel, uint8 playerid,
int32 clen = pcard->get_infos(p, query_flag, use_cache); int32 clen = pcard->get_infos(p, query_flag, use_cache);
p += clen; p += clen;
} else { } else {
*((int32*)p) = LEN_EMPTY; buffer_write<int32_t>(p, LEN_EMPTY);
p += LEN_EMPTY;
} }
} }
} }
...@@ -297,8 +296,7 @@ extern "C" DECL_DLLEXPORT int32 query_field_info(intptr_t pduel, byte* buf) { ...@@ -297,8 +296,7 @@ extern "C" DECL_DLLEXPORT int32 query_field_info(intptr_t pduel, byte* buf) {
*p++ = ptduel->game_field->core.duel_rule; *p++ = ptduel->game_field->core.duel_rule;
for(int playerid = 0; playerid < 2; ++playerid) { for(int playerid = 0; playerid < 2; ++playerid) {
auto& player = ptduel->game_field->player[playerid]; auto& player = ptduel->game_field->player[playerid];
*((int*)p) = player.lp; buffer_write<int32_t>(p, player.lp);
p += 4;
for(auto& pcard : player.list_mzone) { for(auto& pcard : player.list_mzone) {
if(pcard) { if(pcard) {
*p++ = 1; *p++ = 1;
...@@ -326,15 +324,12 @@ extern "C" DECL_DLLEXPORT int32 query_field_info(intptr_t pduel, byte* buf) { ...@@ -326,15 +324,12 @@ extern "C" DECL_DLLEXPORT int32 query_field_info(intptr_t pduel, byte* buf) {
*p++ = (uint8)ptduel->game_field->core.current_chain.size(); *p++ = (uint8)ptduel->game_field->core.current_chain.size();
for(const auto& ch : ptduel->game_field->core.current_chain) { for(const auto& ch : ptduel->game_field->core.current_chain) {
effect* peffect = ch.triggering_effect; effect* peffect = ch.triggering_effect;
*((int*)p) = peffect->get_handler()->data.code; buffer_write<uint32_t>(p, peffect->get_handler()->data.code);
p += 4; buffer_write<uint32_t>(p, peffect->get_handler()->get_info_location());
*((int*)p) = peffect->get_handler()->get_info_location();
p += 4;
*p++ = ch.triggering_controler; *p++ = ch.triggering_controler;
*p++ = (uint8)ch.triggering_location; *p++ = (uint8)ch.triggering_location;
*p++ = ch.triggering_sequence; *p++ = ch.triggering_sequence;
*((int*)p) = peffect->description; buffer_write<uint32_t>(p, peffect->description);
p += 4;
} }
return (int32)(p - buf); return (int32)(p - buf);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment