Mamanyonyo/atrooney-online-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't decode LE contents until after splitting by "&" (#500)

Browse Source 
Should fix evidence, again.
This commit is contained in:
in1tiate 2021-03-20 22:39:15 -05:00 committed by GitHub
parent 510c0f4b17
commit bddf6c67c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/packet_distribution.cpp
View File

@ -120,6 +120,7 @@ void AOApplication::append_to_demofile(QString packet_string)
void AOApplication::server_packet_received(AOPacket *p_packet)
{
QStringList f_contents_encoded = p_packet->get_contents();
p_packet->net_decode();
QString header = p_packet->get_header();
@ -540,12 +541,16 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
if (courtroom_constructed) {
QVector<evi_type> f_evi_list;
for (QString f_string : f_contents) {
for (QString f_string : f_contents_encoded) {
QStringList sub_contents = f_string.split("&");
if (sub_contents.size() < 3)
continue;
// decoding has to be done here instead of on reception
// because this packet uses & as a delimiter for some reason
AOPacket::unescape(sub_contents);
evi_type f_evi;
f_evi.name = sub_contents.at(0);
f_evi.description = sub_contents.at(1);
@ -723,11 +728,9 @@ void AOApplication::send_server_packet(AOPacket *p_packet, bool encoded)
p_packet->net_encode();
QString f_packet = p_packet->to_string();
#ifdef DEBUG_NETWORK
qDebug() << "S:" << f_packet;
#endif
net_manager->ship_server_packet(f_packet);
delete p_packet;