Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-13 05:37:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

use m_responseReadState to avoid calling parseResponse() (as a failsafe for malicious/bad server responses)

Browse Source 
Signed-off-by: iTrooz <hey@itrooz.fr>
This commit is contained in:
iTrooz
2025-01-25 20:19:19 +01:00
parent 439c565961
commit 7c82cd82d7
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
launcher/ui/pages/instance/McClient.cpp
View File

@ -46,18 +46,24 @@ void McClient::sendRequest() {
writePacketToSocket(data); // send status packet writePacketToSocket(data); // send status packet
} }
// Accumulate data until we have a full response, then call parseResponse() // Accumulate data until we have a full response, then call parseResponse() once
void McClient::readRawResponse() { void McClient::readRawResponse() {
if (m_responseReadState == 2) {
return;
}
m_resp.append(m_socket.readAll()); m_resp.append(m_socket.readAll());
if (m_wantedRespLength == 0 && m_resp.size() >= 5) { if (m_responseReadState == 0 && m_resp.size() >= 5) {
m_wantedRespLength = readVarInt(m_resp); m_wantedRespLength = readVarInt(m_resp);
m_responseReadState = 1;
} }
if (m_wantedRespLength != 0 && m_resp.size() >= m_wantedRespLength) { if (m_responseReadState == 1 && m_resp.size() >= m_wantedRespLength) {
if (m_resp.size() > m_wantedRespLength) { if (m_resp.size() > m_wantedRespLength) {
qDebug() << "Warning: Packet length doesn't match actual packet size (" << m_wantedRespLength << " expected vs " << m_resp.size() << " received)"; qDebug() << "Warning: Packet length doesn't match actual packet size (" << m_wantedRespLength << " expected vs " << m_resp.size() << " received)";
} }
parseResponse(); parseResponse();
m_responseReadState = 2;
} }
} }

4
launcher/ui/pages/instance/McClient.h
View File

@ -15,6 +15,10 @@ class McClient : public QObject {
short m_port; short m_port;
QTcpSocket m_socket; QTcpSocket m_socket;
// 0: did not start reading the response yet
// 1: read the response length, still reading the response
// 2: finished reading the response
unsigned m_responseReadState = 0;
unsigned m_wantedRespLength = 0; unsigned m_wantedRespLength = 0;
QByteArray m_resp; QByteArray m_resp;