Public-Mirror/gbe_fork
1
0
Fork 0
mirror of https://github.com/Detanup01/gbe_fork.git synced 2024-11-30 14:25:36 +08:00
Code Issues 1 Projects Releases Wiki Activity

fix crash due to invalid usage of union in steam_gamestats

Browse Source
This commit is contained in:
a 2024-08-02 03:28:30 +03:00
parent 8daa605880
commit 3369c046a9
2 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dll/dll/steam_gamestats.h
View File

@ -33,15 +33,15 @@ public ISteamGameStats
struct Attribute_t struct Attribute_t
{ {
AttributeType_t type{}; const AttributeType_t type;
union { union {
int32 n_data; int32 n_data;
std::string s_data; std::string s_data;
float f_data; float f_data;
int64 ll_data{}; int64 ll_data;
}; };
Attribute_t(); Attribute_t(AttributeType_t type);
Attribute_t(const Attribute_t &other); Attribute_t(const Attribute_t &other);
Attribute_t(Attribute_t &&other); Attribute_t(Attribute_t &&other);
~Attribute_t(); ~Attribute_t();

61
dll/steam_gamestats.cpp
View File

@ -24,39 +24,54 @@
#include "dll/steam_gamestats.h" #include "dll/steam_gamestats.h"
Steam_GameStats::Attribute_t::Attribute_t() Steam_GameStats::Attribute_t::Attribute_t(AttributeType_t type)
{ } :type(type)
{
switch (type)
{
case AttributeType_t::Float: f_data = 0; break;
case AttributeType_t::Int64: ll_data = 0; break;
case AttributeType_t::Int: n_data = 0; break;
case AttributeType_t::Str: new (&s_data) std::string{}; break;
default: PRINT_DEBUG("[X] invalid type %i", (int)type); break;
}
}
Steam_GameStats::Attribute_t::Attribute_t(const Attribute_t &other) Steam_GameStats::Attribute_t::Attribute_t(const Attribute_t &other)
:type(type)
{ {
type = other.type;
switch (other.type) switch (other.type)
{ {
case AttributeType_t::Int: n_data = other.n_data; break; case AttributeType_t::Int: n_data = other.n_data; break;
case AttributeType_t::Str: s_data = other.s_data; break; case AttributeType_t::Str: new (&s_data) std::string(other.s_data); break;
case AttributeType_t::Float: f_data = other.f_data; break; case AttributeType_t::Float: f_data = other.f_data; break;
case AttributeType_t::Int64: ll_data = other.ll_data; break; case AttributeType_t::Int64: ll_data = other.ll_data; break;
default: break; default: PRINT_DEBUG("[X] invalid type %i", (int)other.type); break;
} }
} }
Steam_GameStats::Attribute_t::Attribute_t(Attribute_t &&other) Steam_GameStats::Attribute_t::Attribute_t(Attribute_t &&other)
:type(type)
{ {
type = other.type;
switch (other.type) switch (other.type)
{ {
case AttributeType_t::Int: n_data = other.n_data; break; case AttributeType_t::Int: n_data = other.n_data; break;
case AttributeType_t::Str: s_data = std::move(other.s_data); break; case AttributeType_t::Str: new (&s_data) std::string(std::move(other.s_data)); break;
case AttributeType_t::Float: f_data = other.f_data; break; case AttributeType_t::Float: f_data = other.f_data; break;
case AttributeType_t::Int64: ll_data = other.ll_data; break; case AttributeType_t::Int64: ll_data = other.ll_data; break;
default: break; default: PRINT_DEBUG("[X] invalid type %i", (int)other.type); break;
} }
} }
Steam_GameStats::Attribute_t::~Attribute_t() Steam_GameStats::Attribute_t::~Attribute_t()
{ } {
if (type == AttributeType_t::Str) {
s_data.~basic_string();
}
}
void Steam_GameStats::steam_gamestats_network_low_level(void *object, Common_Message *msg) void Steam_GameStats::steam_gamestats_network_low_level(void *object, Common_Message *msg)
@ -125,35 +140,15 @@ Steam_GameStats::Table_t *Steam_GameStats::get_or_create_session_table(Session_t
Steam_GameStats::Attribute_t *Steam_GameStats::get_or_create_session_att(const char *att_name, Session_t &session, AttributeType_t type_if_create) Steam_GameStats::Attribute_t *Steam_GameStats::get_or_create_session_att(const char *att_name, Session_t &session, AttributeType_t type_if_create)
{ {
Attribute_t *att{}; auto [ele_it, _] = session.attributes.emplace(att_name, type_if_create);
{ return &ele_it->second;
auto att_itr = session.attributes.find(att_name);
if (att_itr != session.attributes.end()) {
att = &att_itr->second;
} else {
att = &session.attributes[att_name];
att->type = type_if_create;
}
}
return att;
} }
Steam_GameStats::Attribute_t *Steam_GameStats::get_or_create_row_att(uint64 ulRowID, const char *att_name, Table_t &table, AttributeType_t type_if_create) Steam_GameStats::Attribute_t *Steam_GameStats::get_or_create_row_att(uint64 ulRowID, const char *att_name, Table_t &table, AttributeType_t type_if_create)
{ {
Attribute_t *att{};
{
auto &row = table.rows[static_cast<unsigned>(ulRowID)]; auto &row = table.rows[static_cast<unsigned>(ulRowID)];
auto att_itr = row.attributes.find(att_name); auto [ele_it, _] = row.attributes.emplace(att_name, type_if_create);
if (att_itr != row.attributes.end()) { return &ele_it->second;
att = &att_itr->second;
} else {
att = &row.attributes[att_name];
att->type = type_if_create;
}
}
return att;
} }